ominfra 0.0.0.dev428__tar.gz → 0.0.0.dev430__tar.gz

{ominfra-0.0.0.dev428/ominfra.egg-info → ominfra-0.0.0.dev430}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ominfra
-Version: 0.0.0.dev428
+Version: 0.0.0.dev430
 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.dev428
-Requires-Dist: omlish==0.0.0.dev428
+Requires-Dist: omdev==0.0.0.dev430
+Requires-Dist: omlish==0.0.0.dev430
 Provides-Extra: all
 Requires-Dist: paramiko~=4.0; extra == "all"
 Requires-Dist: asyncssh~=2.21; extra == "all"

{ominfra-0.0.0.dev428 → ominfra-0.0.0.dev430}/ominfra/scripts/journald2aws.py

@@ -1600,8 +1600,6 @@ class AttrOps(ta.Generic[T]):
         self._eq = _eq
         return _eq
 
-    #
-
     @property
     def hash_eq(self) -> ta.Tuple[
         ta.Callable[[T], int],
@@ -1609,6 +1607,8 @@ class AttrOps(ta.Generic[T]):
     ]:
         return (self.hash, self.eq)
 
+    #
+
     @property
     def repr_hash_eq(self) -> ta.Tuple[
         ta.Callable[[T], str],
@@ -1619,20 +1619,25 @@ class AttrOps(ta.Generic[T]):
 
     #
 
+    class NOT_SET:  # noqa
+        def __new__(cls, *args, **kwargs):  # noqa
+            raise TypeError
+
     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,
+            repr: ta.Union[bool, ta.Type[NOT_SET]] = NOT_SET,  # noqa
+            hash: ta.Union[bool, ta.Type[NOT_SET]] = NOT_SET,  # noqa
+            eq: ta.Union[bool, ta.Type[NOT_SET]] = NOT_SET,
     ) -> 'AttrOps[T]':
-        if repr or all:
+        if all(a is self.NOT_SET for a in (repr, hash, eq)):
+            repr = hash = eq = True  # noqa
+        if repr:
             locals_dct.update(__repr__=self.repr)
-        if hash or all:
+        if hash:
             locals_dct.update(__hash__=self.hash)
-        if eq or all:
+        if eq:
             locals_dct.update(__eq__=self.eq)
         return self
 
@@ -2691,19 +2696,16 @@ def format_num_bytes(num_bytes: int) -> str:
 ##
 
 
-class _LoggingContextInfo:
-    def __mro_entries__(self, bases):
-        return ()
-
-
-LoggingContextInfo: type = ta.cast(ta.Any, _LoggingContextInfo())
+def logging_context_info(cls):
+    return cls
 
 
 ##
 
 
+@logging_context_info
 @ta.final
-class LoggingSourceFileInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+class LoggingSourceFileInfo(ta.NamedTuple):
     file_name: str
     module: str
 
@@ -2720,16 +2722,17 @@ class LoggingSourceFileInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[
             return None
 
         return cls(
-            file_name,
-            module,
+            file_name=file_name,
+            module=module,
         )
 
 
 ##
 
 
+@logging_context_info
 @ta.final
-class LoggingThreadInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+class LoggingThreadInfo(ta.NamedTuple):
     ident: int
     native_id: ta.Optional[int]
     name: str
@@ -2737,31 +2740,33 @@ class LoggingThreadInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc
     @classmethod
     def build(cls) -> 'LoggingThreadInfo':
         return cls(
-            threading.get_ident(),
-            threading.get_native_id() if hasattr(threading, 'get_native_id') else None,
-            threading.current_thread().name,
+            ident=threading.get_ident(),
+            native_id=threading.get_native_id() if hasattr(threading, 'get_native_id') else None,
+            name=threading.current_thread().name,
         )
 
 
 ##
 
 
+@logging_context_info
 @ta.final
-class LoggingProcessInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+class LoggingProcessInfo(ta.NamedTuple):
     pid: int
 
     @classmethod
     def build(cls) -> 'LoggingProcessInfo':
         return cls(
-            os.getpid(),
+            pid=os.getpid(),
         )
 
 
 ##
 
 
+@logging_context_info
 @ta.final
-class LoggingMultiprocessingInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+class LoggingMultiprocessingInfo(ta.NamedTuple):
     process_name: str
 
     @classmethod
@@ -2771,15 +2776,16 @@ class LoggingMultiprocessingInfo(LoggingContextInfo, ta.NamedTuple):  # type: ig
             return None
 
         return cls(
-            mp.current_process().name,
+            process_name=mp.current_process().name,
         )
 
 
 ##
 
 
+@logging_context_info
 @ta.final
-class LoggingAsyncioTaskInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+class LoggingAsyncioTaskInfo(ta.NamedTuple):
     name: str
 
     @classmethod
@@ -2797,7 +2803,7 @@ class LoggingAsyncioTaskInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore
             return None
 
         return cls(
-            task.get_name(),  # Always non-None
+            name=task.get_name(),  # Always non-None
         )
 
 
@@ -2820,36 +2826,66 @@ class NamedLogLevel(int):
 
     #
 
-    @property
-    def exact_name(self) -> ta.Optional[str]:
-        return self._NAMES_BY_INT.get(self)
+    _CACHE: ta.ClassVar[ta.MutableMapping[int, 'NamedLogLevel']] = {}
+
+    @ta.overload
+    def __new__(cls, name: str, offset: int = 0, /) -> 'NamedLogLevel':
+        ...
 
-    _effective_name: ta.Optional[str]
+    @ta.overload
+    def __new__(cls, i: int, /) -> 'NamedLogLevel':
+        ...
+
+    def __new__(cls, x, offset=0, /):
+        if isinstance(x, str):
+            return cls(cls._INTS_BY_NAME[x.upper()] + offset)
+        elif not offset and (c := cls._CACHE.get(x)) is not None:
+            return c
+        else:
+            return super().__new__(cls, x + offset)
+
+    #
+
+    _name_and_offset: ta.Tuple[str, int]
 
     @property
-    def effective_name(self) -> ta.Optional[str]:
+    def name_and_offset(self) -> ta.Tuple[str, int]:
         try:
-            return self._effective_name
+            return self._name_and_offset
         except AttributeError:
             pass
 
-        if (n := self.exact_name) is None:
+        if (n := self._NAMES_BY_INT.get(self)) is not None:
+            t = (n, 0)
+        else:
             for n, i in self._NAME_INT_PAIRS:  # noqa
                 if self >= i:
+                    t = (n, (self - i))
                     break
             else:
-                n = None
+                t = ('NOTSET', int(self))
+
+        self._name_and_offset = t
+        return t
 
-        self._effective_name = n
+    @property
+    def exact_name(self) -> ta.Optional[str]:
+        n, o = self.name_and_offset
+        return n if not o else None
+
+    @property
+    def effective_name(self) -> str:
+        n, _ = self.name_and_offset
         return n
 
     #
 
-    def __repr__(self) -> str:
-        return f'{self.__class__.__name__}({int(self)})'
-
     def __str__(self) -> str:
-        return self.exact_name or f'{self.effective_name or "INVALID"}:{int(self)}'
+        return self.exact_name or f'{self.effective_name}{int(self):+}'
+
+    def __repr__(self) -> str:
+        n, o = self.name_and_offset
+        return f'{self.__class__.__name__}({n!r}{f", {int(o)}" if o else ""})'
 
     #
 
@@ -2869,6 +2905,9 @@ NamedLogLevel.DEBUG = NamedLogLevel(logging.DEBUG)
 NamedLogLevel.NOTSET = NamedLogLevel(logging.NOTSET)
 
 
+NamedLogLevel._CACHE.update({i: NamedLogLevel(i) for i in NamedLogLevel._NAMES_BY_INT})  # noqa
+
+
 ########################################
 # ../../../../../omlish/logs/std/filters.py
 
@@ -4912,7 +4951,9 @@ def check_lite_runtime_version() -> None:
 ##
 
 
-class LoggingCaller(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+@logging_context_info
+@ta.final
+class LoggingCaller(ta.NamedTuple):
     file_path: str
     line_no: int
     name: str
@@ -4965,10 +5006,10 @@ class LoggingCaller(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
                 sinfo = sinfo[:-1]
 
         return cls(
-            f.f_code.co_filename,
-            f.f_lineno or 0,
-            f.f_code.co_name,
-            sinfo,
+            file_path=f.f_code.co_filename,
+            line_no=f.f_lineno or 0,
+            name=f.f_code.co_name,
+            stack_info=sinfo,
         )
 
 
@@ -5036,7 +5077,9 @@ class JsonLoggingFormatter(logging.Formatter):
 ##
 
 
-class LoggingTimeFields(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+@logging_context_info
+@ta.final
+class LoggingTimeFields(ta.NamedTuple):
     """Maps directly to stdlib `logging.LogRecord` fields, and must be kept in sync with it."""
 
     created: float
@@ -5084,9 +5127,9 @@ class LoggingTimeFields(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc
         relative_created = (time_ns - start_time_ns) / 1e6
 
         return cls(
-            created,
-            msecs,
-            relative_created,
+            created=created,
+            msecs=msecs,
+            relative_created=relative_created,
         )
 
 
@@ -5730,7 +5773,7 @@ def subprocess_maybe_shell_wrap_exec(*cmd: str) -> ta.Tuple[str, ...]:
 
 class AnyLogger(Abstract, ta.Generic[T]):
     def is_enabled_for(self, level: LogLevel) -> bool:
-        return self.get_effective_level() >= level
+        return level >= self.get_effective_level()
 
     @abc.abstractmethod
     def get_effective_level(self) -> LogLevel:
@@ -5927,7 +5970,7 @@ class AsyncLogger(AnyLogger[ta.Awaitable[None]], Abstract):
 class AnyNopLogger(AnyLogger[T], Abstract):
     @ta.final
     def get_effective_level(self) -> LogLevel:
-        return 999
+        return -999
 
 
 @ta.final
@@ -6237,7 +6280,7 @@ class LoggingContextLogRecord(logging.LogRecord):
 
 
 ########################################
-# ../../../../../omlish/logs/std/adapters.py
+# ../../../../../omlish/logs/std/loggers.py
 
 
 ##
@@ -6253,6 +6296,9 @@ class StdLogger(Logger):
     def std(self) -> logging.Logger:
         return self._std
 
+    def is_enabled_for(self, level: LogLevel) -> bool:
+        return self._std.isEnabledFor(level)
+
     def get_effective_level(self) -> LogLevel:
         return self._std.getEffectiveLevel()
 

{ominfra-0.0.0.dev428 → ominfra-0.0.0.dev430}/ominfra/scripts/manage.py

@@ -2779,8 +2779,6 @@ class AttrOps(ta.Generic[T]):
         self._eq = _eq
         return _eq
 
-    #
-
     @property
     def hash_eq(self) -> ta.Tuple[
         ta.Callable[[T], int],
@@ -2788,6 +2786,8 @@ class AttrOps(ta.Generic[T]):
     ]:
         return (self.hash, self.eq)
 
+    #
+
     @property
     def repr_hash_eq(self) -> ta.Tuple[
         ta.Callable[[T], str],
@@ -2798,20 +2798,25 @@ class AttrOps(ta.Generic[T]):
 
     #
 
+    class NOT_SET:  # noqa
+        def __new__(cls, *args, **kwargs):  # noqa
+            raise TypeError
+
     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,
+            repr: ta.Union[bool, ta.Type[NOT_SET]] = NOT_SET,  # noqa
+            hash: ta.Union[bool, ta.Type[NOT_SET]] = NOT_SET,  # noqa
+            eq: ta.Union[bool, ta.Type[NOT_SET]] = NOT_SET,
     ) -> 'AttrOps[T]':
-        if repr or all:
+        if all(a is self.NOT_SET for a in (repr, hash, eq)):
+            repr = hash = eq = True  # noqa
+        if repr:
             locals_dct.update(__repr__=self.repr)
-        if hash or all:
+        if hash:
             locals_dct.update(__hash__=self.hash)
-        if eq or all:
+        if eq:
             locals_dct.update(__eq__=self.eq)
         return self
 
@@ -3993,19 +3998,16 @@ def typing_annotations_attr() -> str:
 ##
 
 
-class _LoggingContextInfo:
-    def __mro_entries__(self, bases):
-        return ()
-
-
-LoggingContextInfo: type = ta.cast(ta.Any, _LoggingContextInfo())
+def logging_context_info(cls):
+    return cls
 
 
 ##
 
 
+@logging_context_info
 @ta.final
-class LoggingSourceFileInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+class LoggingSourceFileInfo(ta.NamedTuple):
     file_name: str
     module: str
 
@@ -4022,16 +4024,17 @@ class LoggingSourceFileInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[
             return None
 
         return cls(
-            file_name,
-            module,
+            file_name=file_name,
+            module=module,
         )
 
 
 ##
 
 
+@logging_context_info
 @ta.final
-class LoggingThreadInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+class LoggingThreadInfo(ta.NamedTuple):
     ident: int
     native_id: ta.Optional[int]
     name: str
@@ -4039,31 +4042,33 @@ class LoggingThreadInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc
     @classmethod
     def build(cls) -> 'LoggingThreadInfo':
         return cls(
-            threading.get_ident(),
-            threading.get_native_id() if hasattr(threading, 'get_native_id') else None,
-            threading.current_thread().name,
+            ident=threading.get_ident(),
+            native_id=threading.get_native_id() if hasattr(threading, 'get_native_id') else None,
+            name=threading.current_thread().name,
         )
 
 
 ##
 
 
+@logging_context_info
 @ta.final
-class LoggingProcessInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+class LoggingProcessInfo(ta.NamedTuple):
     pid: int
 
     @classmethod
     def build(cls) -> 'LoggingProcessInfo':
         return cls(
-            os.getpid(),
+            pid=os.getpid(),
         )
 
 
 ##
 
 
+@logging_context_info
 @ta.final
-class LoggingMultiprocessingInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+class LoggingMultiprocessingInfo(ta.NamedTuple):
     process_name: str
 
     @classmethod
@@ -4073,15 +4078,16 @@ class LoggingMultiprocessingInfo(LoggingContextInfo, ta.NamedTuple):  # type: ig
             return None
 
         return cls(
-            mp.current_process().name,
+            process_name=mp.current_process().name,
         )
 
 
 ##
 
 
+@logging_context_info
 @ta.final
-class LoggingAsyncioTaskInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+class LoggingAsyncioTaskInfo(ta.NamedTuple):
     name: str
 
     @classmethod
@@ -4099,7 +4105,7 @@ class LoggingAsyncioTaskInfo(LoggingContextInfo, ta.NamedTuple):  # type: ignore
             return None
 
         return cls(
-            task.get_name(),  # Always non-None
+            name=task.get_name(),  # Always non-None
         )
 
 
@@ -4122,36 +4128,66 @@ class NamedLogLevel(int):
 
     #
 
-    @property
-    def exact_name(self) -> ta.Optional[str]:
-        return self._NAMES_BY_INT.get(self)
+    _CACHE: ta.ClassVar[ta.MutableMapping[int, 'NamedLogLevel']] = {}
+
+    @ta.overload
+    def __new__(cls, name: str, offset: int = 0, /) -> 'NamedLogLevel':
+        ...
 
-    _effective_name: ta.Optional[str]
+    @ta.overload
+    def __new__(cls, i: int, /) -> 'NamedLogLevel':
+        ...
+
+    def __new__(cls, x, offset=0, /):
+        if isinstance(x, str):
+            return cls(cls._INTS_BY_NAME[x.upper()] + offset)
+        elif not offset and (c := cls._CACHE.get(x)) is not None:
+            return c
+        else:
+            return super().__new__(cls, x + offset)
+
+    #
+
+    _name_and_offset: ta.Tuple[str, int]
 
     @property
-    def effective_name(self) -> ta.Optional[str]:
+    def name_and_offset(self) -> ta.Tuple[str, int]:
         try:
-            return self._effective_name
+            return self._name_and_offset
         except AttributeError:
             pass
 
-        if (n := self.exact_name) is None:
+        if (n := self._NAMES_BY_INT.get(self)) is not None:
+            t = (n, 0)
+        else:
             for n, i in self._NAME_INT_PAIRS:  # noqa
                 if self >= i:
+                    t = (n, (self - i))
                     break
             else:
-                n = None
+                t = ('NOTSET', int(self))
 
-        self._effective_name = n
+        self._name_and_offset = t
+        return t
+
+    @property
+    def exact_name(self) -> ta.Optional[str]:
+        n, o = self.name_and_offset
+        return n if not o else None
+
+    @property
+    def effective_name(self) -> str:
+        n, _ = self.name_and_offset
         return n
 
     #
 
-    def __repr__(self) -> str:
-        return f'{self.__class__.__name__}({int(self)})'
-
     def __str__(self) -> str:
-        return self.exact_name or f'{self.effective_name or "INVALID"}:{int(self)}'
+        return self.exact_name or f'{self.effective_name}{int(self):+}'
+
+    def __repr__(self) -> str:
+        n, o = self.name_and_offset
+        return f'{self.__class__.__name__}({n!r}{f", {int(o)}" if o else ""})'
 
     #
 
@@ -4171,6 +4207,9 @@ NamedLogLevel.DEBUG = NamedLogLevel(logging.DEBUG)
 NamedLogLevel.NOTSET = NamedLogLevel(logging.NOTSET)
 
 
+NamedLogLevel._CACHE.update({i: NamedLogLevel(i) for i in NamedLogLevel._NAMES_BY_INT})  # noqa
+
+
 ########################################
 # ../../../omlish/logs/std/filters.py
 
@@ -7590,7 +7629,9 @@ class PredicateTimeout(Timeout):
 ##
 
 
-class LoggingCaller(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+@logging_context_info
+@ta.final
+class LoggingCaller(ta.NamedTuple):
     file_path: str
     line_no: int
     name: str
@@ -7643,10 +7684,10 @@ class LoggingCaller(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
                 sinfo = sinfo[:-1]
 
         return cls(
-            f.f_code.co_filename,
-            f.f_lineno or 0,
-            f.f_code.co_name,
-            sinfo,
+            file_path=f.f_code.co_filename,
+            line_no=f.f_lineno or 0,
+            name=f.f_code.co_name,
+            stack_info=sinfo,
         )
 
 
@@ -7657,6 +7698,7 @@ class LoggingCaller(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
 ##
 
 
+@ta.runtime_checkable
 class LoggerLike(ta.Protocol):
     """Satisfied by both our Logger and stdlib logging.Logger."""
 
@@ -7745,7 +7787,9 @@ class JsonLoggingFormatter(logging.Formatter):
 ##
 
 
-class LoggingTimeFields(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc]
+@logging_context_info
+@ta.final
+class LoggingTimeFields(ta.NamedTuple):
     """Maps directly to stdlib `logging.LogRecord` fields, and must be kept in sync with it."""
 
     created: float
@@ -7793,9 +7837,9 @@ class LoggingTimeFields(LoggingContextInfo, ta.NamedTuple):  # type: ignore[misc
         relative_created = (time_ns - start_time_ns) / 1e6
 
         return cls(
-            created,
-            msecs,
-            relative_created,
+            created=created,
+            msecs=msecs,
+            relative_created=relative_created,
         )
 
 
@@ -10966,7 +11010,7 @@ class DeploySpec(DeploySpecKeyed[DeployKey]):
 
 class AnyLogger(Abstract, ta.Generic[T]):
     def is_enabled_for(self, level: LogLevel) -> bool:
-        return self.get_effective_level() >= level
+        return level >= self.get_effective_level()
 
     @abc.abstractmethod
     def get_effective_level(self) -> LogLevel:
@@ -11163,7 +11207,7 @@ class AsyncLogger(AnyLogger[ta.Awaitable[None]], Abstract):
 class AnyNopLogger(AnyLogger[T], Abstract):
     @ta.final
     def get_effective_level(self) -> LogLevel:
-        return 999
+        return -999
 
 
 @ta.final
@@ -12085,7 +12129,7 @@ class SingleDirDeployPathOwner(DeployPathOwner, Abstract):
 
 
 ########################################
-# ../../../omlish/logs/std/adapters.py
+# ../../../omlish/logs/std/loggers.py
 
 
 ##
@@ -12101,6 +12145,9 @@ class StdLogger(Logger):
     def std(self) -> logging.Logger:
         return self._std
 
+    def is_enabled_for(self, level: LogLevel) -> bool:
+        return self._std.isEnabledFor(level)
+
     def get_effective_level(self) -> LogLevel:
         return self._std.getEffectiveLevel()