ominfra 0.0.0.dev425__tar.gz → 0.0.0.dev426__tar.gz

{ominfra-0.0.0.dev425/ominfra.egg-info → ominfra-0.0.0.dev426}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ominfra
-Version: 0.0.0.dev425
+Version: 0.0.0.dev426
 Summary: ominfra
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,8 +14,8 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omdev==0.0.0.dev425
-Requires-Dist: omlish==0.0.0.dev425
+Requires-Dist: omdev==0.0.0.dev426
+Requires-Dist: omlish==0.0.0.dev426
 Provides-Extra: all
 Requires-Dist: paramiko~=4.0; extra == "all"
 Requires-Dist: asyncssh~=2.21; extra == "all"

{ominfra-0.0.0.dev425 → ominfra-0.0.0.dev426}/ominfra/clouds/aws/journald2aws/cursor.py

@@ -2,7 +2,10 @@
 import os.path
 import typing as ta
 
-from omlish.lite.logs import log
+from omlish.logs.modules import get_module_logger
+
+
+log = get_module_logger(globals())  # noqa
 
 
 ##

{ominfra-0.0.0.dev425 → ominfra-0.0.0.dev426}/ominfra/clouds/aws/journald2aws/driver.py

@@ -40,8 +40,8 @@ import typing as ta
 from omlish.lite.cached import cached_nullary
 from omlish.lite.check import check
 from omlish.lite.contextmanagers import ExitStacked
-from omlish.lite.logs import log
 from omlish.lite.runtime import is_debugger_attached
+from omlish.logs.modules import get_module_logger
 from omlish.os.pidfiles.pidfile import Pidfile
 
 from ....journald.messages import JournalctlMessage  # noqa
@@ -53,6 +53,9 @@ from .cursor import JournalctlToAwsCursor
 from .poster import JournalctlToAwsPosterWorker
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 

{ominfra-0.0.0.dev425 → ominfra-0.0.0.dev426}/ominfra/clouds/aws/journald2aws/poster.py

@@ -9,7 +9,7 @@ import time
 import typing as ta
 import urllib.request
 
-from omlish.lite.logs import log
+from omlish.logs.modules import get_module_logger
 
 from ....journald.messages import JournalctlMessage  # noqa
 from ....threadworkers import ThreadWorker
@@ -18,6 +18,9 @@ from ..logs import AwsPutLogEventsResponse
 from .cursor import JournalctlToAwsCursor
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 

{ominfra-0.0.0.dev425 → ominfra-0.0.0.dev426}/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-0.0.0.dev425 → ominfra-0.0.0.dev426}/ominfra/journald/tailer.py

@@ -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-0.0.0.dev425 → ominfra-0.0.0.dev426}/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-0.0.0.dev425 → ominfra-0.0.0.dev426}/ominfra/manage/main.py

@@ -18,10 +18,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 +33,9 @@ from .targets.connection import ManageTargetConnector
 from .targets.targets import ManageTarget
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 

{ominfra-0.0.0.dev425 → ominfra-0.0.0.dev426}/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,6 +33,9 @@ else:
     main_bootstrap: ta.Any = None
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 

{ominfra-0.0.0.dev425 → ominfra-0.0.0.dev426}/ominfra/manage/remote/execution.py

@@ -12,7 +12,7 @@ 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 ..commands.base import Command
 from ..commands.base import CommandException
@@ -25,6 +25,9 @@ from .channel import RemoteChannel
 T = ta.TypeVar('T')
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 

{ominfra-0.0.0.dev425 → ominfra-0.0.0.dev426}/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-0.0.0.dev425 → ominfra-0.0.0.dev426}/ominfra/manage/system/platforms.py

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

{ominfra-0.0.0.dev425 → ominfra-0.0.0.dev426}/ominfra/scripts/journald2aws.py

@@ -67,8 +67,10 @@ TomlParseFloat = ta.Callable[[str], ta.Any]  # ta.TypeAlias
 TomlKey = ta.Tuple[str, ...]  # ta.TypeAlias
 TomlPos = int  # ta.TypeAlias
 
-# ../../../../omlish/lite/cached.py
+# ../../../../omlish/lite/attrops.py
 T = ta.TypeVar('T')
+
+# ../../../../omlish/lite/cached.py
 CallableT = ta.TypeVar('CallableT', bound=ta.Callable)
 
 # ../../../../omlish/lite/check.py
@@ -1304,6 +1306,335 @@ class Abstract:
             update_abstracts(cls, force=True)
 
 
+########################################
+# ../../../../../omlish/lite/attrops.py
+"""
+TODO:
+ - dotted paths!
+ - per-attr repr transform / filter
+ - __ne__ ? cases where it still matters
+ - ordering ?
+"""
+
+
+##
+
+
+@ta.final
+class AttrOps(ta.Generic[T]):
+    @ta.final
+    class Attr:
+        def __init__(
+                self,
+                name: str,
+                *,
+                display: ta.Optional[str] = None,
+
+                repr: bool = True,  # noqa
+                hash: bool = True,  # noqa
+                eq: bool = True,
+        ) -> None:
+            if '.' in name:
+                raise NotImplementedError('Dotted paths not yet supported')
+            if not name.isidentifier() or name.startswith('__'):
+                raise AttributeError(f'Invalid attr: {name!r}')
+            self._name = name
+
+            if display is None:
+                display = name[1:] if name.startswith('_') and len(name) > 1 else name
+            self._display = display
+
+            self._repr = repr
+            self._hash = hash
+            self._eq = eq
+
+        @classmethod
+        def of(
+                cls,
+                o: ta.Union[
+                    str,
+                    ta.Tuple[str, str],
+                    'AttrOps.Attr',
+                ],
+        ) -> 'AttrOps.Attr':
+            if isinstance(o, AttrOps.Attr):
+                return o
+            elif isinstance(o, str):
+                return cls(o)
+            else:
+                name, disp = o
+                return cls(
+                    name,
+                    display=disp,
+                )
+
+        @property
+        def name(self) -> str:
+            return self._name
+
+        @property
+        def display(self) -> str:
+            return self._display
+
+        @property
+        def hash(self) -> bool:
+            return self._hash
+
+        @property
+        def eq(self) -> bool:
+            return self._eq
+
+    @ta.overload
+    def __init__(
+            self,
+            *attrs: ta.Sequence[ta.Union[
+                str,
+                ta.Tuple[str, str],
+                Attr,
+            ]],
+            with_module: bool = False,
+            use_qualname: bool = False,
+            with_id: bool = False,
+            repr_filter: ta.Optional[ta.Callable[[ta.Any], bool]] = None,
+            recursive: bool = False,
+            subtypes_eq: bool = False,
+    ) -> None:
+        ...
+
+    @ta.overload
+    def __init__(
+            self,
+            attrs_fn: ta.Callable[[T], ta.Tuple[ta.Union[
+                ta.Any,
+                ta.Tuple[str, ta.Any],
+                Attr,
+            ], ...]],
+            /,
+            *,
+            with_module: bool = False,
+            use_qualname: bool = False,
+            with_id: bool = False,
+            repr_filter: ta.Optional[ta.Callable[[ta.Any], bool]] = None,
+            recursive: bool = False,
+            subtypes_eq: bool = False,
+    ) -> None:
+        ...
+
+    def __init__(
+            self,
+            *args,
+            with_module=False,
+            use_qualname=False,
+            with_id=False,
+            repr_filter=None,
+            recursive=False,
+            subtypes_eq=False,
+    ) -> None:
+        if args and len(args) == 1 and callable(args[0]):
+            self._attrs: ta.Sequence[AttrOps.Attr] = self._capture_attrs(args[0])
+        else:
+            self._attrs = list(map(AttrOps.Attr.of, args))
+
+        self._with_module: bool = with_module
+        self._use_qualname: bool = use_qualname
+        self._with_id: bool = with_id
+        self._repr_filter: ta.Optional[ta.Callable[[ta.Any], bool]] = repr_filter
+        self._recursive: bool = recursive
+        self._subtypes_eq: bool = subtypes_eq
+
+    @property
+    def attrs(self) -> ta.Sequence[Attr]:
+        return self._attrs
+
+    #
+
+    @ta.final
+    class _AttrCapturer:
+        def __init__(self, fn):
+            self.__fn = fn
+
+        def __getattr__(self, attr):
+            return self.__fn(self, attr)
+
+    @classmethod
+    def _capture_attrs(cls, fn: ta.Callable) -> ta.Sequence[Attr]:
+        def access(parent, attr):
+            dct[(ret := cls._AttrCapturer(access))] = (parent, attr)
+            return ret
+
+        dct: dict = {}
+        raw = fn(root := cls._AttrCapturer(access))
+
+        def rec(cap):  # noqa
+            if cap is root:
+                return
+            parent, attr = dct[cap]
+            yield from rec(parent)
+            yield attr
+
+        attrs: ta.List[AttrOps.Attr] = []
+        for o in raw:
+            if isinstance(o, AttrOps.Attr):
+                attrs.append(o)
+                continue
+
+            if isinstance(o, tuple):
+                disp, cap, = o
+            else:
+                disp, cap = None, o
+
+            path = tuple(rec(cap))
+
+            attrs.append(AttrOps.Attr(
+                '.'.join(path),
+                display=disp,
+            ))
+
+        return attrs
+
+    #
+
+    _repr: ta.Callable[[T], str]
+
+    @property
+    def repr(self) -> ta.Callable[[T], str]:
+        try:
+            return self._repr
+        except AttributeError:
+            pass
+
+        def _repr(o: T) -> str:
+            vs = ', '.join(
+                f'{a._display}={v!r}'  # noqa
+                for a in self._attrs
+                if a._repr  # noqa
+                for v in [getattr(o, a._name)]  # noqa
+                if self._repr_filter is None or self._repr_filter(v)
+            )
+
+            return (
+                f'{o.__class__.__module__ + "." if self._with_module else ""}'
+                f'{o.__class__.__qualname__ if self._use_qualname else o.__class__.__name__}'
+                f'{("@" + hex(id(o))[2:]) if self._with_id else ""}'
+                f'({vs})'
+            )
+
+        if self._recursive:
+            _repr = self._reprlib().recursive_repr()(_repr)
+
+        self._repr = _repr
+        return _repr
+
+    _reprlib_: ta.ClassVar[ta.Any]
+
+    @classmethod
+    def _reprlib(cls) -> ta.Any:
+        try:
+            return cls._reprlib_
+        except AttributeError:
+            pass
+
+        import reprlib  # noqa
+
+        cls._reprlib_ = reprlib
+        return reprlib
+
+    #
+
+    _hash: ta.Callable[[T], int]
+
+    @property
+    def hash(self) -> ta.Callable[[T], int]:
+        try:
+            return self._hash
+        except AttributeError:
+            pass
+
+        def _hash(o: T) -> int:
+            return hash(tuple(
+                getattr(o, a._name)  # noqa
+                for a in self._attrs
+                if a._hash  # noqa
+            ))
+
+        self._hash = _hash
+        return _hash
+
+    #
+
+    _eq: ta.Callable[[T, ta.Any], ta.Union[bool, 'types.NotImplementedType']]
+
+    @property
+    def eq(self) -> ta.Callable[[T, ta.Any], ta.Union[bool, 'types.NotImplementedType']]:
+        try:
+            return self._eq
+        except AttributeError:
+            pass
+
+        def _eq(o: T, x: ta.Any) -> 'ta.Union[bool, types.NotImplementedType]':
+            if self._subtypes_eq:
+                if not isinstance(x, type(o)):
+                    return NotImplemented
+            else:
+                if type(x) is not type(o):
+                    return NotImplemented
+
+            return all(
+                getattr(o, a._name) == getattr(x, a._name)  # noqa
+                for a in self._attrs
+                if a._eq  # noqa
+            )
+
+        self._eq = _eq
+        return _eq
+
+    #
+
+    @property
+    def hash_eq(self) -> ta.Tuple[
+        ta.Callable[[T], int],
+        ta.Callable[[T, ta.Any], ta.Union[bool, 'types.NotImplementedType']],
+    ]:
+        return (self.hash, self.eq)
+
+    @property
+    def repr_hash_eq(self) -> ta.Tuple[
+        ta.Callable[[T], str],
+        ta.Callable[[T], int],
+        ta.Callable[[T, ta.Any], ta.Union[bool, 'types.NotImplementedType']],
+    ]:
+        return (self.repr, self.hash, self.eq)
+
+    #
+
+    def install(
+            self,
+            locals_dct: ta.MutableMapping[str, ta.Any],
+            *,
+            all: bool = False,  # noqa
+            repr: bool = False,  # noqa
+            hash: bool = False,  # noqa
+            eq: bool = False,
+    ) -> 'AttrOps[T]':
+        if repr or all:
+            locals_dct.update(__repr__=self.repr)
+        if hash or all:
+            locals_dct.update(__hash__=self.hash)
+        if eq or all:
+            locals_dct.update(__eq__=self.eq)
+        return self
+
+
+attr_ops = AttrOps[ta.Any]
+
+
+##
+
+
+def attr_repr(obj: ta.Any, *attrs: str, **kwargs: ta.Any) -> str:
+    return AttrOps(*attrs, **kwargs).repr(obj)
+
+
 ########################################
 # ../../../../../omlish/lite/cached.py
 
@@ -1322,7 +1653,7 @@ class _AbstractCachedNullary:
     def __call__(self, *args, **kwargs):  # noqa
         raise TypeError
 
-    def __get__(self, instance, owner):  # noqa
+    def __get__(self, instance, owner=None):  # noqa
         bound = instance.__dict__[self._fn.__name__] = self.__class__(self._fn.__get__(instance, owner))
         return bound
 
@@ -2081,13 +2412,6 @@ json_dump_compact: ta.Callable[..., None] = functools.partial(json.dump, **JSON_
 json_dumps_compact: ta.Callable[..., str] = functools.partial(json.dumps, **JSON_COMPACT_KWARGS)
 
 
-########################################
-# ../../../../../omlish/lite/logs.py
-
-
-log = logging.getLogger(__name__)
-
-
 ########################################
 # ../../../../../omlish/lite/objects.py
 
@@ -2333,13 +2657,6 @@ def split_keep_delimiter(s, d):
 ##
 
 
-def attr_repr(obj: ta.Any, *attrs: str) -> str:
-    return f'{type(obj).__name__}({", ".join(f"{attr}={getattr(obj, attr)!r}" for attr in attrs)})'
-
-
-##
-
-
 FORMAT_NUM_BYTES_SUFFIXES: ta.Sequence[str] = ['B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB']
 
 
@@ -2355,6 +2672,17 @@ def format_num_bytes(num_bytes: int) -> str:
     return f'{num_bytes / 1024 ** (len(FORMAT_NUM_BYTES_SUFFIXES) - 1):.2f}{FORMAT_NUM_BYTES_SUFFIXES[-1]}'
 
 
+########################################
+# ../../../../../omlish/logs/modules.py
+
+
+##
+
+
+def get_module_logger(mod_globals: ta.Mapping[str, ta.Any]) -> logging.Logger:
+    return logging.getLogger(mod_globals.get('__name__'))
+
+
 ########################################
 # ../../../../../omlish/logs/std/filters.py
 
@@ -3068,6 +3396,9 @@ class AwsDataclassMeta:
 # ../cursor.py
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 
@@ -3127,6 +3458,9 @@ TODO:
 """
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 
@@ -4849,6 +5183,9 @@ class AwsLogMessageBuilder:
 # ../../../../journald/messages.py
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 
@@ -5110,6 +5447,9 @@ TODO:
 """
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 
@@ -5589,6 +5929,9 @@ $SYSTEMD_URLIFY
 """
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##
 
 
@@ -5732,6 +6075,9 @@ class Journald2AwsConfig:
 """
 
 
+log = get_module_logger(globals())  # noqa
+
+
 ##