ominfra 0.0.0.dev368__py3-none-any.whl → 0.0.0.dev501__py3-none-any.whl

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/messages.py

@@ -6,7 +6,10 @@ 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
 
 
 ##

ominfra/journald/tailer.py

@@ -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,9 @@ from .messages import JournalctlMessage  # noqa
 from .messages import JournalctlMessageBuilder
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 

ominfra/manage/bootstrap_.py

@@ -1,7 +1,7 @@
 # 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
+from omlish.logs.std.standard import configure_standard_logging
 
 from .bootstrap import MainBootstrap
 from .inject import bind_main

ominfra/manage/commands/base.py

@@ -1,12 +1,13 @@
 # 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/deploy/commands.py

@@ -1,7 +1,7 @@
 # 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/specs.py

@@ -1,9 +1,9 @@
 # ruff: noqa: UP006 UP007 UP045
-import abc
 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/paths/owners.py

@@ -3,6 +3,7 @@ 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
@@ -12,7 +13,7 @@ from .paths import DeployPath
 ##
 
 
-class DeployPathOwner(abc.ABC):
+class DeployPathOwner(Abstract):
     @abc.abstractmethod
     def get_owned_deploy_paths(self) -> ta.AbstractSet[DeployPath]:
         raise NotImplementedError
@@ -21,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

@@ -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

ominfra/manage/deploy/tags.py

@@ -1,8 +1,8 @@
 # ruff: noqa: UP006 UP007 UP045
-import abc
 import dataclasses as dc
 import typing as ta
 
+from omlish.lite.abstract import Abstract
 from omlish.lite.check import check
 from omlish.lite.marshal import register_single_field_type_obj_marshaler
 
@@ -30,11 +30,11 @@ DEPLOY_TAG_ILLEGAL_STRS: ta.AbstractSet[str] = frozenset([
 
 
 @dc.dataclass(frozen=True, order=True)
-class DeployTag(abc.ABC):  # noqa
+class DeployTag(Abstract):
     s: str
 
     def __post_init__(self) -> None:
-        check.not_in(abc.ABC, type(self).__bases__)
+        check.not_in(Abstract, type(self).__bases__)
         check.non_empty_str(self.s)
         for ch in DEPLOY_TAG_ILLEGAL_STRS:
             check.state(ch not in self.s)
@@ -47,12 +47,12 @@ class DeployTag(abc.ABC):  # noqa
     def __init_subclass__(cls, **kwargs: ta.Any) -> None:
         super().__init_subclass__(**kwargs)
 
-        if abc.ABC in cls.__bases__:
+        if Abstract in cls.__bases__:
             return
 
         for b in cls.__bases__:
             if issubclass(b, DeployTag):
-                check.in_(abc.ABC, b.__bases__)
+                check.in_(Abstract, b.__bases__)
 
         check.non_empty_str(tn := cls.tag_name)
         check.equal(tn, tn.lower().strip())
@@ -99,7 +99,7 @@ class DeployTime(DeployTag):
 ##
 
 
-class NameDeployTag(DeployTag, abc.ABC):  # noqa
+class NameDeployTag(DeployTag, Abstract):
     pass
 
 
@@ -116,7 +116,7 @@ class DeployConf(NameDeployTag):
 ##
 
 
-class KeyDeployTag(DeployTag, abc.ABC):  # noqa
+class KeyDeployTag(DeployTag, Abstract):
     pass
 
 
@@ -133,7 +133,7 @@ class DeployAppKey(KeyDeployTag):
 ##
 
 
-class RevDeployTag(DeployTag, abc.ABC):  # noqa
+class RevDeployTag(DeployTag, Abstract):
     pass
 
 

ominfra/manage/inject.py

@@ -5,6 +5,7 @@ from omlish.lite.inject import InjectorBindingOrBindings
 from omlish.lite.inject import InjectorBindings
 from omlish.lite.inject import inj
 from omlish.lite.marshal import ObjMarshalerManager
+from omlish.lite.marshal import new_obj_marshaler_manager
 
 from .bootstrap import MainBootstrap
 from .commands.inject import bind_commands
@@ -63,7 +64,7 @@ def bind_main(
     #
 
     def build_obj_marshaler_manager(insts: ObjMarshalerInstallers) -> ObjMarshalerManager:
-        msh = ObjMarshalerManager()
+        msh = new_obj_marshaler_manager()
         inst: ObjMarshalerInstaller
         for inst in insts:
             inst.fn(msh)

ominfra/manage/main.py

@@ -8,7 +8,6 @@ import asyncio
 import dataclasses as dc
 import json
 import os.path
-import sys
 import typing as ta
 
 from omdev.home.paths import get_home_paths
@@ -18,10 +17,10 @@ from omlish.argparse.cli import argparse_cmd
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
 from omlish.lite.configs import load_config_file_obj
-from omlish.lite.logs import log  # noqa
 from omlish.lite.marshal import ObjMarshalerManager
 from omlish.lite.marshal import ObjMarshalOptions
 from omlish.lite.pycharm import PycharmRemoteDebug
+from omlish.logs.modules import get_module_logger
 
 from .bootstrap import MainBootstrap
 from .bootstrap_ import main_bootstrap
@@ -33,6 +32,9 @@ from .targets.connection import ManageTargetConnector
 from .targets.targets import ManageTarget
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 
@@ -147,7 +149,7 @@ class MainCli(ArgparseCli):
 
 
 def _main() -> None:
-    sys.exit(asyncio.run(MainCli().async_cli_run()))
+    raise SystemExit(asyncio.run(MainCli().async_cli_run()))
 
 
 if __name__ == '__main__':

ominfra/manage/remote/_main.py

@@ -13,9 +13,9 @@ from omlish.asyncs.asyncio.streams import asyncio_open_stream_writer
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
 from omlish.lite.inject import Injector
-from omlish.lite.logs import log
 from omlish.lite.marshal import ObjMarshalerManager
 from omlish.lite.pycharm import pycharm_debug_connect
+from omlish.logs.modules import get_module_logger
 from omlish.os.deathsig import set_process_deathsig
 
 from ...pyremote import pyremote_bootstrap_finalize
@@ -33,12 +33,16 @@ else:
     main_bootstrap: ta.Any = None
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 
 class _RemoteExecutionLogHandler(logging.Handler):
     def __init__(self, fn: ta.Callable[[str], None]) -> None:
         super().__init__()
+
         self._fn = fn
 
     def emit(self, record):

ominfra/manage/remote/channel.py

@@ -5,6 +5,7 @@ import json
 import struct
 import typing as ta
 
+from omlish.lite.abstract import Abstract
 from omlish.lite.json import json_dumps_compact
 from omlish.lite.marshal import OBJ_MARSHALER_MANAGER
 from omlish.lite.marshal import ObjMarshalerManager
@@ -16,7 +17,7 @@ T = ta.TypeVar('T')
 ##
 
 
-class RemoteChannel(abc.ABC):
+class RemoteChannel(Abstract):
     @abc.abstractmethod
     def send_obj(self, o: ta.Any, ty: ta.Any = None) -> ta.Awaitable[None]:
         raise NotImplementedError

ominfra/manage/remote/execution.py

@@ -3,7 +3,6 @@
 TODO:
  - sequence all messages
 """
-import abc
 import asyncio
 import dataclasses as dc
 import itertools
@@ -11,8 +10,10 @@ import logging
 import time
 import typing as ta
 
+from omlish.lite.abstract import Abstract
 from omlish.lite.check import check
-from omlish.lite.logs import log
+from omlish.logs.modules import get_module_logger
+from omlish.logs.protocols import LoggerLike
 
 from ..commands.base import Command
 from ..commands.base import CommandException
@@ -25,11 +26,14 @@ from .channel import RemoteChannel
 T = ta.TypeVar('T')
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 
 class _RemoteProtocol:
-    class Message(abc.ABC):  # noqa
+    class Message(Abstract):
         async def send(self, chan: RemoteChannel) -> None:
             await chan.send_obj(self, _RemoteProtocol.Message)
 
@@ -39,7 +43,7 @@ class _RemoteProtocol:
 
     #
 
-    class Request(Message, abc.ABC):  # noqa
+    class Request(Message, Abstract):
         pass
 
     @dc.dataclass(frozen=True)
@@ -53,7 +57,7 @@ class _RemoteProtocol:
 
     #
 
-    class Response(Message, abc.ABC):  # noqa
+    class Response(Message, Abstract):
         pass
 
     @dc.dataclass(frozen=True)
@@ -394,7 +398,7 @@ class RemoteCommandExecutor(CommandExecutor):
             self,
             cmd: Command,
             *,
-            log: ta.Optional[logging.Logger] = None,  # noqa
+            log: ta.Optional[LoggerLike] = None,  # noqa
             omit_exc_object: bool = False,
     ) -> CommandOutputOrException:
         try:

ominfra/manage/remote/spawning.py

@@ -8,6 +8,7 @@ import subprocess
 import typing as ta
 
 from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
+from omlish.lite.abstract import Abstract
 from omlish.lite.check import check
 from omlish.shlex import shlex_maybe_quote
 from omlish.subprocesses.base import SUBPROCESS_CHANNEL_OPTION_VALUES
@@ -17,7 +18,7 @@ from omlish.subprocesses.base import SubprocessChannelOption
 ##
 
 
-class RemoteSpawning(abc.ABC):
+class RemoteSpawning(Abstract):
     @dc.dataclass(frozen=True)
     class Target:
         shell: ta.Optional[str] = None

ominfra/manage/system/commands.py

@@ -3,7 +3,7 @@ import dataclasses as dc
 import typing as ta
 
 from omlish.lite.check import check
-from omlish.lite.logs import log
+from omlish.logs.modules import get_module_logger
 
 from ..commands.base import Command
 from ..commands.base import CommandExecutor
@@ -11,6 +11,9 @@ from .packages import SystemPackage
 from .packages import SystemPackageManager
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 

ominfra/manage/system/packages.py

@@ -10,6 +10,7 @@ import os
 import typing as ta
 
 from omlish.asyncs.asyncio.subprocesses import asyncio_subprocesses
+from omlish.lite.abstract import Abstract
 from omlish.lite.check import check
 
 
@@ -25,7 +26,7 @@ class SystemPackage:
     version: ta.Optional[str] = None
 
 
-class SystemPackageManager(abc.ABC):
+class SystemPackageManager(Abstract):
     @abc.abstractmethod
     def update(self) -> ta.Awaitable[None]:
         raise NotImplementedError

ominfra/manage/system/platforms.py

@@ -1,21 +1,24 @@
-import abc
 import dataclasses as dc
 import sys
 
+from omlish.lite.abstract import Abstract
 from omlish.lite.cached import cached_nullary
-from omlish.lite.logs import log
+from omlish.logs.modules import get_module_logger
 from omlish.os.linux import LinuxOsRelease
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 
 @dc.dataclass(frozen=True)
-class Platform(abc.ABC):  # noqa
+class Platform(Abstract):
     pass
 
 
-class LinuxPlatform(Platform, abc.ABC):
+class LinuxPlatform(Platform, Abstract):
     pass
 
 

ominfra/manage/targets/bestpython.sh

@@ -1,7 +1,7 @@
 bv=""
 bx=""
 
-for v in "" 3 3.{8..13}; do
+for v in "" 3 3.{8..14}; do
     x="python$v"
     v=$($x -c "import sys; print((\"%02d\" * 3) % sys.version_info[:3])" 2>/dev/null)
     if [ $? -eq 0 ] && [ "$v" \> 030799 ] && ([ -z "$bv" ] || [ "$v" \> "$bv" ]); then

ominfra/manage/targets/connection.py

@@ -4,6 +4,7 @@ import contextlib
 import dataclasses as dc
 import typing as ta
 
+from omlish.lite.abstract import Abstract
 from omlish.lite.check import check
 
 from ..bootstrap import MainBootstrap
@@ -24,7 +25,7 @@ from .targets import SubprocessManageTarget
 ##
 
 
-class ManageTargetConnector(abc.ABC):
+class ManageTargetConnector(Abstract):
     @abc.abstractmethod
     def connect(self, tgt: ManageTarget) -> ta.AsyncContextManager[CommandExecutor]:
         raise NotImplementedError

ominfra/manage/targets/targets.py

@@ -3,18 +3,18 @@
 It's desugaring. Subprocess and locals are only leafs. Retain an origin?
 ** TWO LAYERS ** - ManageTarget is user-facing, ConnectorTarget is bound, internal
 """
-import abc
 import dataclasses as dc
 import enum
 import typing as ta
 
+from omlish.lite.abstract import Abstract
 from omlish.lite.check import check
 
 
 ##
 
 
-class ManageTarget(abc.ABC):  # noqa
+class ManageTarget(Abstract):
     def __init_subclass__(cls, **kwargs: ta.Any) -> None:
         super().__init_subclass__(**kwargs)
 
@@ -36,15 +36,15 @@ class PythonRemoteManageTarget:
 #
 
 
-class RemoteManageTarget(ManageTarget, abc.ABC):
+class RemoteManageTarget(ManageTarget, Abstract):
     pass
 
 
-class PhysicallyRemoteManageTarget(RemoteManageTarget, abc.ABC):
+class PhysicallyRemoteManageTarget(RemoteManageTarget, Abstract):
     pass
 
 
-class LocalManageTarget(ManageTarget, abc.ABC):
+class LocalManageTarget(ManageTarget, Abstract):
     pass