ominfra 0.0.0.dev315__py3-none-any.whl → 0.0.0.dev488__py3-none-any.whl

ominfra/clouds/gcp/auth.py

@@ -7,6 +7,9 @@ from omlish.http import all as http
 from omlish.http import jwt
 
 
+##
+
+
 DEFAULT_JWT_SCOPE = 'https://www.googleapis.com/auth/cloud-platform'
 
 

ominfra/commands/runners.py

@@ -38,6 +38,7 @@ class CommandRunner(lang.Abstract):
     class ReturnCodeError(Exception):
         def __init__(self, result: 'CommandRunner.Result') -> None:
             super().__init__(f'Bad return code: {result.rc}', result)
+
             self.result = result
 
     @abc.abstractmethod
@@ -52,6 +53,7 @@ class LocalCommandRunner(CommandRunner):
 
     def __init__(self, cfg: Config = Config()) -> None:
         super().__init__()
+
         self._cfg = check.isinstance(cfg, LocalCommandRunner.Config)
 
     async def run_command(self, cmd: CommandRunner.Command) -> CommandRunner.Result:

ominfra/commands/ssh.py

@@ -56,6 +56,7 @@ class SshSubprocessCommandRunner(CommandRunner):
             lcr: LocalCommandRunner | None = None,
     ) -> None:
         super().__init__()
+
         self._cfg = check.isinstance(cfg, SshConfig)
         self._lcr = check.isinstance(lcr, LocalCommandRunner) if lcr is not None else LocalCommandRunner()
 
@@ -89,6 +90,7 @@ class AsyncsshSshCommandRunner(CommandRunner):
             cfg: SshConfig,
     ) -> None:
         super().__init__()
+
         self._cfg = check.isinstance(cfg, SshConfig)
 
     async def run_command(self, cmd: CommandRunner.Command) -> CommandRunner.Result:
@@ -122,6 +124,7 @@ class ParamikoSshCommandRunner(CommandRunner):
             cfg: SshConfig,
     ) -> None:
         super().__init__()
+
         self._cfg = check.isinstance(cfg, SshConfig)
 
     def _run_command(self, cmd: CommandRunner.Command) -> CommandRunner.Result:

ominfra/journald/genmessages.py

@@ -10,6 +10,9 @@ import time
 import uuid
 
 
+##
+
+
 def _main() -> None:
     parser = argparse.ArgumentParser()
 

ominfra/journald/messages.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 # @omlish-lite
 import dataclasses as dc
 import json
@@ -6,7 +6,13 @@ import typing as ta
 
 from omlish.io.buffers import DelimitingBuffer
 from omlish.lite.check import check
-from omlish.lite.logs import log
+from omlish.logs.modules import get_module_logger
+
+
+log = get_module_logger(globals())  # noqa
+
+
+##
 
 
 @dc.dataclass(frozen=True)

ominfra/journald/tailer.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP007
+# ruff: noqa: UP007 UP045
 # @omlish-lite
 """
 TODO:
@@ -190,7 +190,7 @@ Output Options
     Reverse output so that the newest entries are displayed first.
 --show-cursor
     The cursor is shown after the last entry after two dashes:
--- cursor: s=0639…
+-- cursor: s=0639...
     The format of the cursor is private and subject to change.
 --utc
     Express time in Coordinated Universal Time (UTC).
@@ -218,7 +218,7 @@ Output Options
 --no-tail
     Show all stored output lines, even in follow mode. Undoes the effect of --lines=.
 -q, --quiet
-    Suppresses all informational messages (i.e. "-- Journal begins at …", "-- Reboot --"), any warning messages
+    Suppresses all informational messages (i.e. "-- Journal begins at ...", "-- Reboot --"), any warning messages
     regarding inaccessible system journals when run as a normal user.
 
 Pager Control Options
@@ -302,10 +302,10 @@ Commands
     Instead of showing journal contents, show internal header information of the journal fields accessed. This option is
     particularly useful when trying to identify out-of-order journal entries, as happens for example when the machine is
     booted with the wrong system time.
---list-catalog [128-bit-ID…]
+--list-catalog [128-bit-ID...]
     List the contents of the message catalog as a table of message IDs, plus their short description strings. If any
     128-bit-IDs are specified, only those entries are shown.
---dump-catalog [128-bit-ID…]
+--dump-catalog [128-bit-ID...]
     Show the contents of the message catalog, with entries separated by a line consisting of two dashes and the ID (the
     format is the same as .catalog files). If any 128-bit-IDs are specified, only those entries are shown.
 --update-catalog
@@ -326,11 +326,11 @@ Environment
 $SYSTEMD_LOG_LEVEL
     The maximum log level of emitted messages (messages with a higher log level, i.e. less important ones, will be
     suppressed). Takes a comma-separated list of values. A value may be either one of (in order of decreasing
-    importance) emerg, alert, crit, err, warning, notice, info, debug, or an integer in the range 0…7. See syslog(3) for
-    more information. Each value may optionally be prefixed with one of console, syslog, kmsg or journal followed by a
-    colon to set the maximum log level for that specific log target (e.g. SYSTEMD_LOG_LEVEL=debug,console:info specifies
-    to log at debug level except when logging to the console which should be at info level). Note that the global
-    maximum log level takes priority over any per target maximum log levels.
+    importance) emerg, alert, crit, err, warning, notice, info, debug, or an integer in the range 0...7. See syslog(3)
+    for more information. Each value may optionally be prefixed with one of console, syslog, kmsg or journal followed by
+    a colon to set the maximum log level for that specific log target (e.g. SYSTEMD_LOG_LEVEL=debug,console:info
+    specifies to log at debug level except when logging to the console which should be at info level). Note that the
+    global maximum log level takes priority over any per target maximum log levels.
 $SYSTEMD_LOG_COLOR
     A boolean. If true, messages written to the tty will be colored according to priority. This setting is only useful
     when messages are written directly to the terminal, because journalctl(1) and other tools that display logs will
@@ -409,7 +409,7 @@ import typing as ta
 
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
-from omlish.lite.logs import log
+from omlish.logs.modules import get_module_logger
 from omlish.subprocesses.utils import subprocess_close
 from omlish.subprocesses.wrap import subprocess_shell_wrap_exec
 
@@ -418,6 +418,12 @@ from .messages import JournalctlMessage  # noqa
 from .messages import JournalctlMessageBuilder
 
 
+log = get_module_logger(globals())  # noqa
+
+
+##
+
+
 class JournalctlTailerWorker(ThreadWorker):
     DEFAULT_CMD: ta.ClassVar[ta.Sequence[str]] = ['journalctl']
 

ominfra/manage/bootstrap.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 import dataclasses as dc
 
 from .config import MainConfig
@@ -7,6 +7,9 @@ from .remote.config import RemoteConfig
 from .system.config import SystemConfig
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class MainBootstrap:
     main_config: MainConfig = MainConfig()

ominfra/manage/bootstrap_.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 from omlish.lite.inject import Injector
 from omlish.lite.inject import inj
 from omlish.logs.standard import configure_standard_logging
@@ -7,6 +7,9 @@ from .bootstrap import MainBootstrap
 from .inject import bind_main
 
 
+##
+
+
 def main_bootstrap(bs: MainBootstrap) -> Injector:
     if (log_level := bs.main_config.log_level) is not None:
         configure_standard_logging(log_level)

ominfra/manage/commands/base.py

@@ -1,12 +1,13 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 import abc
 import dataclasses as dc
-import logging
 import traceback
 import typing as ta
 
+from omlish.lite.abstract import Abstract
 from omlish.lite.check import check
 from omlish.lite.strings import snake_case
+from omlish.logs.protocols import LoggerLike
 
 
 CommandT = ta.TypeVar('CommandT', bound='Command')
@@ -17,9 +18,9 @@ CommandOutputT = ta.TypeVar('CommandOutputT', bound='Command.Output')
 
 
 @dc.dataclass(frozen=True)
-class Command(abc.ABC, ta.Generic[CommandOutputT]):
+class Command(Abstract, ta.Generic[CommandOutputT]):
     @dc.dataclass(frozen=True)
-    class Output(abc.ABC):  # noqa
+    class Output(Abstract):
         pass
 
     @ta.final
@@ -65,7 +66,7 @@ class CommandException:
         )
 
 
-class CommandOutputOrException(abc.ABC, ta.Generic[CommandOutputT]):
+class CommandOutputOrException(Abstract, ta.Generic[CommandOutputT]):
     @property
     @abc.abstractmethod
     def output(self) -> ta.Optional[CommandOutputT]:
@@ -83,7 +84,7 @@ class CommandOutputOrExceptionData(CommandOutputOrException):
     exception: ta.Optional[CommandException] = None
 
 
-class CommandExecutor(abc.ABC, ta.Generic[CommandT, CommandOutputT]):
+class CommandExecutor(Abstract, ta.Generic[CommandT, CommandOutputT]):
     @abc.abstractmethod
     def execute(self, cmd: CommandT) -> ta.Awaitable[CommandOutputT]:
         raise NotImplementedError
@@ -92,7 +93,7 @@ class CommandExecutor(abc.ABC, ta.Generic[CommandT, CommandOutputT]):
             self,
             cmd: CommandT,
             *,
-            log: ta.Optional[logging.Logger] = None,
+            log: ta.Optional[LoggerLike] = None,
             omit_exc_object: bool = False,
     ) -> CommandOutputOrException[CommandOutputT]:
         try:

ominfra/manage/commands/inject.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 import dataclasses as dc
 import functools
 import typing as ta

ominfra/manage/commands/injection.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 import typing as ta
 
 from omlish.lite.inject import InjectorBindingOrBindings
@@ -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/manage/commands/local.py

@@ -1,9 +1,12 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 from .base import Command
 from .base import CommandExecutor
 from .types import CommandExecutorMap
 
 
+##
+
+
 class LocalCommandExecutor(CommandExecutor):
     def __init__(
             self,

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/manage/commands/subprocess.py

@@ -1,4 +1,4 @@
-# ruff: noqa: TC003 UP006 UP007
+# ruff: noqa: TC003 UP006 UP007 UP045
 import asyncio.subprocess
 import dataclasses as dc
 import os
@@ -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/manage/commands/types.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 import typing as ta
 
 from .base import Command

ominfra/manage/config.py

@@ -1,8 +1,11 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 import dataclasses as dc
 import typing as ta
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class MainConfig:
     log_level: ta.Optional[str] = 'INFO'

ominfra/manage/deploy/apps.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 import dataclasses as dc
 import json
 import os.path
@@ -20,6 +20,9 @@ from .types import DeployHome
 from .venvs import DeployVenvManager
 
 
+##
+
+
 class DeployAppManager(DeployPathOwner):
     def __init__(
             self,

ominfra/manage/deploy/commands.py

@@ -1,7 +1,7 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 import dataclasses as dc
 
-from omlish.lite.logs import log
+from omlish.logs.modules import get_module_logger
 
 from ..commands.base import Command
 from ..commands.base import CommandExecutor
@@ -9,6 +9,9 @@ from .deploy import DeployDriverFactory
 from .specs import DeploySpec
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 

ominfra/manage/deploy/conf/inject.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 import typing as ta
 
 from omlish.lite.inject import InjectorBindingOrBindings
@@ -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/manage/deploy/conf/manager.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 """
 TODO:
  - @conf DeployPathPlaceholder? :|

ominfra/manage/deploy/conf/specs.py

@@ -1,9 +1,9 @@
-# ruff: noqa: UP006 UP007
-import abc
+# ruff: noqa: UP006 UP007 UP045
 import dataclasses as dc
 import typing as ta
 
 from omlish.formats.ini.sections import IniSectionSettingsMap
+from omlish.lite.abstract import Abstract
 from omlish.lite.check import check
 from omlish.lite.marshal import register_single_field_type_obj_marshaler
 
@@ -13,7 +13,7 @@ from ..paths.specs import check_valid_deploy_spec_path
 ##
 
 
-class DeployAppConfContent(abc.ABC):  # noqa
+class DeployAppConfContent(Abstract):
     pass
 
 

ominfra/manage/deploy/config.py

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

ominfra/manage/deploy/deploy.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 import datetime
 import os.path
 import typing as ta

ominfra/manage/deploy/git.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 """
 TODO:
  - parse refs, resolve revs

ominfra/manage/deploy/inject.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 import contextlib
 import os.path
 import typing as ta

ominfra/manage/deploy/injection.py

@@ -1,10 +1,13 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 from omlish.lite.inject import InjectorBindings
 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/manage/deploy/interp.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 import dataclasses as dc
 
 from omdev.interp.default import get_default_interp_resolver

ominfra/manage/deploy/nginx.py

@@ -1,8 +1,11 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 """
 verify - nginx -t
 """
 
 
+##
+
+
 class DeployNginxManager:
     pass

ominfra/manage/deploy/paths/inject.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 import typing as ta
 
 from omlish.lite.inject import InjectorBindingOrBindings
@@ -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/manage/deploy/paths/manager.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 import typing as ta
 
 from omlish.lite.cached import cached_nullary
@@ -9,6 +9,9 @@ from .paths import DeployPath
 from .paths import DeployPathError
 
 
+##
+
+
 class DeployPathsManager:
     def __init__(
             self,

ominfra/manage/deploy/paths/owners.py

@@ -1,15 +1,19 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 import abc
 import os.path
 import typing as ta
 
+from omlish.lite.abstract import Abstract
 from omlish.lite.check import check
 
 from ..types import DeployHome
 from .paths import DeployPath
 
 
-class DeployPathOwner(abc.ABC):
+##
+
+
+class DeployPathOwner(Abstract):
     @abc.abstractmethod
     def get_owned_deploy_paths(self) -> ta.AbstractSet[DeployPath]:
         raise NotImplementedError
@@ -18,7 +22,7 @@ class DeployPathOwner(abc.ABC):
 DeployPathOwners = ta.NewType('DeployPathOwners', ta.Sequence[DeployPathOwner])
 
 
-class SingleDirDeployPathOwner(DeployPathOwner, abc.ABC):
+class SingleDirDeployPathOwner(DeployPathOwner, Abstract):
     def __init__(
             self,
             *args: ta.Any,

ominfra/manage/deploy/paths/paths.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 """
 TODO:
  - run/{.pid,.sock}
@@ -13,6 +13,7 @@ import dataclasses as dc
 import itertools
 import typing as ta
 
+from omlish.lite.abstract import Abstract
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
 from omlish.lite.strings import split_keep_delimiter
@@ -32,7 +33,7 @@ class DeployPathError(Exception):
     pass
 
 
-class DeployPathRenderable(abc.ABC):
+class DeployPathRenderable(Abstract):
     @cached_nullary
     def __str__(self) -> str:
         return self.render(None)
@@ -45,7 +46,7 @@ class DeployPathRenderable(abc.ABC):
 ##
 
 
-class DeployPathNamePart(DeployPathRenderable, abc.ABC):
+class DeployPathNamePart(DeployPathRenderable, Abstract):
     @classmethod
     def parse(cls, s: str) -> 'DeployPathNamePart':
         check.non_empty_str(s)
@@ -137,7 +138,7 @@ class DeployPathName(DeployPathRenderable):
 
 
 @dc.dataclass(frozen=True)
-class DeployPathPart(DeployPathRenderable, abc.ABC):  # noqa
+class DeployPathPart(DeployPathRenderable, Abstract):
     name: DeployPathName
 
     @property