ominfra 0.0.0.dev356__tar.gz → 0.0.0.dev358__tar.gz

{ominfra-0.0.0.dev356/ominfra.egg-info → ominfra-0.0.0.dev358}/PKG-INFO

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

{ominfra-0.0.0.dev356 → ominfra-0.0.0.dev358}/ominfra/manage/commands/injection.py

@@ -11,6 +11,9 @@ from .base import CommandExecutorRegistration
 from .base import CommandRegistration
 
 
+##
+
+
 def bind_command(
         command_cls: ta.Type[Command],
         executor_cls: ta.Optional[ta.Type[CommandExecutor]],

{ominfra-0.0.0.dev356 → ominfra-0.0.0.dev358}/ominfra/manage/commands/local.py

@@ -4,6 +4,9 @@ from .base import CommandExecutor
 from .types import CommandExecutorMap
 
 
+##
+
+
 class LocalCommandExecutor(CommandExecutor):
     def __init__(
             self,

{ominfra-0.0.0.dev356 → ominfra-0.0.0.dev358}/ominfra/manage/commands/marshal.py

@@ -5,6 +5,9 @@ from .base import Command
 from .base import CommandNameMap
 
 
+##
+
+
 def install_command_marshaling(
         cmds: CommandNameMap,
         msh: ObjMarshalerManager,

{ominfra-0.0.0.dev356 → ominfra-0.0.0.dev358}/ominfra/manage/commands/subprocess.py

@@ -28,13 +28,26 @@ class SubprocessCommand(Command['SubprocessCommand.Output']):
     env: ta.Optional[ta.Mapping[str, str]] = None
 
     stdout: str = 'pipe'  # SubprocessChannelOption
+    decode_stdout: ta.Optional[str] = None
+
     stderr: str = 'pipe'  # SubprocessChannelOption
+    decode_stderr: ta.Optional[str] = None
 
     input: ta.Optional[bytes] = None
+    encode_input: ta.Optional[str] = None
+    input_str: ta.Optional[str] = None
+
     timeout: ta.Optional[float] = None
 
     def __post_init__(self) -> None:
         check.not_isinstance(self.cmd, str)
+        check.state(not (self.input is not None and self.input_str is not None))
+        if self.decode_stdout is not None:
+            check.non_empty_str(self.decode_stdout)
+        if self.decode_stderr is not None:
+            check.non_empty_str(self.decode_stderr)
+        if self.encode_input is not None:
+            check.non_empty_str(self.encode_input)
 
     @dc.dataclass(frozen=True)
     class Output(Command.Output):
@@ -44,11 +57,25 @@ class SubprocessCommand(Command['SubprocessCommand.Output']):
         elapsed_s: float
 
         stdout: ta.Optional[bytes] = None
+        stdout_str: ta.Optional[str] = None
+
         stderr: ta.Optional[bytes] = None
+        stderr_str: ta.Optional[str] = None
 
 
 class SubprocessCommandExecutor(CommandExecutor[SubprocessCommand, SubprocessCommand.Output]):
+    DEFAULT_INPUT_ENCODING: ta.ClassVar[str] = 'utf-8'
+
     async def execute(self, cmd: SubprocessCommand) -> SubprocessCommand.Output:
+        input_bytes: ta.Optional[bytes]
+        if cmd.input is not None:
+            check.none(cmd.input_str)
+            input_bytes = cmd.input
+        elif cmd.input_str is not None:
+            input_bytes = cmd.input_str.encode(cmd.encode_input or self.DEFAULT_INPUT_ENCODING)
+        else:
+            input_bytes = None
+
         proc: asyncio.subprocess.Process
         async with asyncio_subprocesses.popen(
             *subprocess_maybe_shell_wrap_exec(*cmd.cmd),
@@ -57,7 +84,7 @@ class SubprocessCommandExecutor(CommandExecutor[SubprocessCommand, SubprocessCom
             cwd=cmd.cwd,
             env={**os.environ, **(cmd.env or {})},
 
-            stdin=subprocess.PIPE if cmd.input is not None else None,
+            stdin=subprocess.PIPE if input_bytes is not None else None,
             stdout=SUBPROCESS_CHANNEL_OPTION_VALUES[ta.cast(SubprocessChannelOption, cmd.stdout)],
             stderr=SUBPROCESS_CHANNEL_OPTION_VALUES[ta.cast(SubprocessChannelOption, cmd.stderr)],
 
@@ -66,17 +93,28 @@ class SubprocessCommandExecutor(CommandExecutor[SubprocessCommand, SubprocessCom
             start_time = time.time()
             stdout, stderr = await asyncio_subprocesses.communicate(
                 proc,
-                input=cmd.input,
+                input=input,
                 timeout=cmd.timeout,
             )
             end_time = time.time()
 
+        out_kw: ta.Dict[str, ta.Any] = {}
+        if stdout is not None:
+            if cmd.decode_stdout is not None:
+                out_kw.update(stdout_str=stdout.decode(cmd.decode_stdout))
+            else:
+                out_kw.update(stdout=stdout)
+        if stderr is not None:
+            if cmd.decode_stderr is not None:
+                out_kw.update(stderr_str=stderr.decode(cmd.decode_stderr))
+            else:
+                out_kw.update(stderr=stderr)
+
         return SubprocessCommand.Output(
             rc=check.not_none(proc.returncode),
             pid=proc.pid,
 
             elapsed_s=end_time - start_time,
 
-            stdout=stdout,  # noqa
-            stderr=stderr,  # noqa
+            **out_kw,
         )

{ominfra-0.0.0.dev356 → ominfra-0.0.0.dev358}/ominfra/manage/deploy/apps.py

@@ -20,6 +20,9 @@ from .types import DeployHome
 from .venvs import DeployVenvManager
 
 
+##
+
+
 class DeployAppManager(DeployPathOwner):
     def __init__(
             self,

{ominfra-0.0.0.dev356 → ominfra-0.0.0.dev358}/ominfra/manage/deploy/conf/inject.py

@@ -9,6 +9,9 @@ from ..injection import bind_deploy_manager
 from .manager import DeployConfManager
 
 
+##
+
+
 def bind_deploy_conf() -> InjectorBindings:
     lst: ta.List[InjectorBindingOrBindings] = [
         bind_deploy_manager(DeployConfManager),

{ominfra-0.0.0.dev356 → ominfra-0.0.0.dev358}/ominfra/manage/deploy/injection.py

@@ -5,6 +5,9 @@ from omlish.lite.inject import inj
 from .paths.owners import DeployPathOwner
 
 
+##
+
+
 def bind_deploy_manager(cls: type) -> InjectorBindings:
     return inj.as_bindings(
         inj.bind(cls, singleton=True),

{ominfra-0.0.0.dev356 → ominfra-0.0.0.dev358}/ominfra/manage/deploy/nginx.py

@@ -4,5 +4,8 @@ verify - nginx -t
 """
 
 
+##
+
+
 class DeployNginxManager:
     pass

{ominfra-0.0.0.dev356 → ominfra-0.0.0.dev358}/ominfra/manage/deploy/paths/inject.py

@@ -10,6 +10,9 @@ from .owners import DeployPathOwner
 from .owners import DeployPathOwners
 
 
+##
+
+
 def bind_deploy_paths() -> InjectorBindings:
     lst: ta.List[InjectorBindingOrBindings] = [
         inj.bind_array(DeployPathOwner),

{ominfra-0.0.0.dev356 → ominfra-0.0.0.dev358}/ominfra/manage/deploy/paths/manager.py

@@ -9,6 +9,9 @@ from .paths import DeployPath
 from .paths import DeployPathError
 
 
+##
+
+
 class DeployPathsManager:
     def __init__(
             self,

{ominfra-0.0.0.dev356 → ominfra-0.0.0.dev358}/ominfra/manage/deploy/paths/owners.py

@@ -9,6 +9,9 @@ from ..types import DeployHome
 from .paths import DeployPath
 
 
+##
+
+
 class DeployPathOwner(abc.ABC):
     @abc.abstractmethod
     def get_owned_deploy_paths(self) -> ta.AbstractSet[DeployPath]:

{ominfra-0.0.0.dev356 → ominfra-0.0.0.dev358}/ominfra/manage/deploy/paths/specs.py

@@ -2,6 +2,9 @@
 from omlish.lite.check import check
 
 
+##
+
+
 def check_valid_deploy_spec_path(s: str) -> str:
     check.non_empty_str(s)
     for c in ['..', '//']:

{ominfra-0.0.0.dev356 → ominfra-0.0.0.dev358}/ominfra/manage/deploy/systemd.py

@@ -22,6 +22,9 @@ from .tmp import DeployHomeAtomics
 from .types import DeployHome
 
 
+##
+
+
 class DeploySystemdManager:
     def __init__(
             self,

{ominfra-0.0.0.dev356 → ominfra-0.0.0.dev358}/ominfra/manage/deploy/tmp.py

@@ -8,6 +8,9 @@ from .paths.owners import SingleDirDeployPathOwner
 from .types import DeployHome
 
 
+##
+
+
 class DeployHomeAtomics(Func1[DeployHome, AtomicPathSwapping]):
     pass
 

{ominfra-0.0.0.dev356 → ominfra-0.0.0.dev358}/ominfra/manage/deploy/venvs.py

@@ -15,6 +15,9 @@ from omlish.lite.check import check
 from .specs import DeployVenvSpec
 
 
+##
+
+
 class DeployVenvManager:
     async def setup_venv(
             self,

{ominfra-0.0.0.dev356 → ominfra-0.0.0.dev358}/ominfra/manage/remote/config.py

@@ -5,6 +5,9 @@ import typing as ta
 from omlish.lite.pycharm import PycharmRemoteDebug
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class RemoteConfig:
     payload_file: ta.Optional[str] = None

{ominfra-0.0.0.dev356 → ominfra-0.0.0.dev358}/ominfra/manage/remote/connection.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007 UP045
+# ruff: noqa: UP006 UP007 UP043 UP045
 import asyncio
 import contextlib
 import typing as ta

{ominfra-0.0.0.dev356 → ominfra-0.0.0.dev358}/ominfra/manage/remote/payload.py

@@ -9,6 +9,9 @@ from omlish.lite.cached import cached_nullary
 RemoteExecutionPayloadFile = ta.NewType('RemoteExecutionPayloadFile', str)
 
 
+##
+
+
 @cached_nullary
 def _get_self_src() -> str:
     return inspect.getsource(sys.modules[__name__])

{ominfra-0.0.0.dev356 → ominfra-0.0.0.dev358}/ominfra/manage/remote/spawning.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007 UP045
+# ruff: noqa: UP006 UP007 UP043 UP045
 import abc
 import asyncio
 import contextlib

{ominfra-0.0.0.dev356 → ominfra-0.0.0.dev358}/ominfra/manage/system/config.py

@@ -5,6 +5,9 @@ import typing as ta
 from .platforms import Platform
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class SystemConfig:
     platform: ta.Optional[Platform] = None

{ominfra-0.0.0.dev356 → ominfra-0.0.0.dev358}/ominfra/manage/system/inject.py

@@ -20,6 +20,9 @@ from .platforms import Platform
 from .platforms import detect_system_platform
 
 
+##
+
+
 def bind_system(
         *,
         system_config: SystemConfig,

{ominfra-0.0.0.dev356 → ominfra-0.0.0.dev358}/ominfra/manage/system/packages.py

@@ -13,7 +13,10 @@ from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
 from omlish.lite.check import check
 
 
-SystemPackageOrStr = ta.Union['SystemPackage', str]
+SystemPackageOrStr = ta.Union['SystemPackage', str]  # ta.TypeAlias
+
+
+##
 
 
 @dc.dataclass(frozen=True)

{ominfra-0.0.0.dev356 → ominfra-0.0.0.dev358}/ominfra/manage/targets/connection.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007 UP045
+# ruff: noqa: UP006 UP007 UP043 UP045
 import abc
 import contextlib
 import dataclasses as dc

{ominfra-0.0.0.dev356 → ominfra-0.0.0.dev358}/ominfra/pyremote.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007 UP045
+# ruff: noqa: UP006 UP007 UP043 UP045
 # @omlish-lite
 """
 Basically this: https://mitogen.networkgenomics.com/howitworks.html
@@ -438,15 +438,21 @@ class PyremoteBootstrapDriver:
         if isinstance(payload_src, str):
             parts = [payload_src]
         else:
-            parts = list(payload_src)
+            parts = []
+            for i, p in enumerate(payload_src):
+                if i:
+                    parts.append('\n\n')
+                parts.append(p)
 
         if (mn := options.main_name_override) is not None:
-            parts.insert(0, f'__name__ = {mn!r}')
+            # Must go on same single line as first line of user payload to preserve '<stdin>' line numbers. If more
+            # things wind up having to be done here, it can still be crammed on one line into a single `exec()`.
+            parts.insert(0, f'__name__ = {mn!r}; ')
 
         if len(parts) == 1:
             return parts[0]
         else:
-            return '\n\n'.join(parts)
+            return ''.join(parts)
 
     #
 

{ominfra-0.0.0.dev356 → ominfra-0.0.0.dev358}/ominfra/scripts/journald2aws.py

@@ -5,7 +5,7 @@
 # @omlish-generated
 # @omlish-amalg-output ../clouds/aws/journald2aws/main.py
 # @omlish-git-diff-omit
-# ruff: noqa: N802 UP006 UP007 UP036 UP045
+# ruff: noqa: N802 UP006 UP007 UP036 UP043 UP045
 import abc
 import argparse
 import base64