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

ominfra/manage/deploy/paths/specs.py

@@ -1,7 +1,10 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 from omlish.lite.check import check
 
 
+##
+
+
 def check_valid_deploy_spec_path(s: str) -> str:
     check.non_empty_str(s)
     for c in ['..', '//']:

ominfra/manage/deploy/paths/types.py

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

ominfra/manage/deploy/specs.py

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

ominfra/manage/deploy/systemd.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 """
 TODO:
  - verify - systemd-analyze
@@ -22,6 +22,9 @@ from .tmp import DeployHomeAtomics
 from .types import DeployHome
 
 
+##
+
+
 class DeploySystemdManager:
     def __init__(
             self,

ominfra/manage/deploy/tags.py

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

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 from omlish.lite.check import check
 from omlish.lite.typing import Func1
 from omlish.os.atomics import AtomicPathSwapping
@@ -8,6 +8,9 @@ from .paths.owners import SingleDirDeployPathOwner
 from .types import DeployHome
 
 
+##
+
+
 class DeployHomeAtomics(Func1[DeployHome, AtomicPathSwapping]):
     pass
 

ominfra/manage/deploy/venvs.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 """
 TODO:
  - interp
@@ -15,6 +15,9 @@ from omlish.lite.check import check
 from .specs import DeployVenvSpec
 
 
+##
+
+
 class DeployVenvManager:
     async def setup_venv(
             self,

ominfra/manage/inject.py

@@ -1,10 +1,11 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 import typing as ta
 
 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

@@ -1,14 +1,13 @@
 # @omlish-amalg ../scripts/manage.py
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 """
-manage.py -s 'docker run -i python:3.12'
+manage.py -s 'docker run -i python:3.13'
 manage.py -s 'ssh -i /foo/bar.pem foo@bar.baz' -q --python=python3.8
 """
 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,12 @@ from .targets.connection import ManageTargetConnector
 from .targets.targets import ManageTarget
 
 
+log = get_module_logger(globals())  # noqa
+
+
+##
+
+
 @dc.dataclass(frozen=True)
 class ManageConfig:
     targets: ta.Optional[ta.Mapping[str, ManageTarget]] = None
@@ -144,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/marshal.py

@@ -4,6 +4,9 @@ import typing as ta
 from omlish.lite.marshal import ObjMarshalerManager
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class ObjMarshalerInstaller:
     fn: ta.Callable[[ObjMarshalerManager], None]

ominfra/manage/remote/_main.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 import asyncio
 import functools
 import logging
@@ -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

@@ -1,10 +1,11 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 import abc
 import asyncio
 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/config.py

@@ -1,10 +1,13 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 import dataclasses as dc
 import typing as ta
 
 from omlish.lite.pycharm import PycharmRemoteDebug
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class RemoteConfig:
     payload_file: ta.Optional[str] = None

ominfra/manage/remote/connection.py

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

ominfra/manage/remote/execution.py

@@ -1,9 +1,8 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 """
 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/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
@@ -13,6 +13,9 @@ from .spawning import RemoteSpawning
 from .spawning import SubprocessRemoteSpawning
 
 
+##
+
+
 def bind_remote(
         *,
         remote_config: RemoteConfig,

ominfra/manage/remote/payload.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 import inspect
 import sys
 import typing as ta
@@ -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/manage/remote/spawning.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP043 UP045
 import abc
 import asyncio
 import contextlib
@@ -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

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

@@ -1,10 +1,13 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 import dataclasses as dc
 import typing as ta
 
 from .platforms import Platform
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class SystemConfig:
     platform: ta.Optional[Platform] = None

ominfra/manage/system/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
@@ -20,6 +20,9 @@ from .platforms import Platform
 from .platforms import detect_system_platform
 
 
+##
+
+
 def bind_system(
         *,
         system_config: SystemConfig,

ominfra/manage/system/packages.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 """
 TODO:
  - yum/rpm
@@ -10,10 +10,14 @@ 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
 
 
-SystemPackageOrStr = ta.Union['SystemPackage', str]
+SystemPackageOrStr = ta.Union['SystemPackage', str]  # ta.TypeAlias
+
+
+##
 
 
 @dc.dataclass(frozen=True)
@@ -22,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.py

@@ -4,6 +4,9 @@ from omlish.lite.cached import cached_nullary
 from omlish.lite.resources import read_package_resource_text
 
 
+##
+
+
 BEST_PYTHON_SH = read_package_resource_text(__package__, 'bestpython.sh')
 
 

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

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

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 import typing as ta
 
 from omlish.lite.inject import Injector
@@ -17,6 +17,9 @@ from .targets import LocalManageTarget
 from .targets import SshManageTarget
 
 
+##
+
+
 def bind_targets() -> InjectorBindings:
     lst: ta.List[InjectorBindingOrBindings] = [
         inj.bind(LocalManageTargetConnector, singleton=True),

ominfra/manage/targets/targets.py

@@ -1,20 +1,20 @@
-# ruff: noqa: UP006 UP007
+# ruff: noqa: UP006 UP007 UP045
 """
 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
 
 

ominfra/pyremote.py

@@ -1,4 +1,4 @@
-# ruff: noqa: UP006 UP007
+# 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)
 
     #