ominfra 0.0.0.dev431__py3-none-any.whl → 0.0.0.dev433__py3-none-any.whl

ominfra/scripts/journald2aws.py

@@ -5467,6 +5467,16 @@ class LoggingContext(Abstract):
             raise TypeError(f'LoggingContextInfo absent: {ty}')
         return info
 
+
+@ta.final
+class SimpleLoggingContext(LoggingContext):
+    def __init__(self, *infos: LoggingContextInfo) -> None:
+        self._infos: ta.Dict[ta.Type[LoggingContextInfo], LoggingContextInfo] = {type(i): i for i in infos}
+
+    def get_info(self, ty: ta.Type[LoggingContextInfoT]) -> ta.Optional[LoggingContextInfoT]:
+        return self._infos.get(ty)
+
+
 ##
 
 
@@ -5517,16 +5527,17 @@ class CaptureLoggingContextImpl(CaptureLoggingContext):
             stack_offset: int = 0,
             stack_info: bool = False,
     ) -> None:
-        # TODO: Name, Msg, Extra
-
         if time_ns is None:
             time_ns = time.time_ns()
 
+        # Done early to not trample on sys.exc_info()
+        exc = LoggingContextInfos.Exc.build(exc_info)
+
         self._infos: ta.Dict[ta.Type[LoggingContextInfo], LoggingContextInfo] = {}
         self._set_info(
             LoggingContextInfos.Level.build(level),
+            exc,
             LoggingContextInfos.Time.build(time_ns),
-            LoggingContextInfos.Exc.build(exc_info),
         )
 
         if caller is not CaptureLoggingContextImpl.NOT_SET:
@@ -5668,10 +5679,14 @@ def _locking_logging_module_lock() -> ta.Iterator[None]:
 def configure_standard_logging(
         level: ta.Union[int, str] = logging.INFO,
         *,
-        json: bool = False,
         target: ta.Optional[logging.Logger] = None,
+
         force: bool = False,
+
         handler_factory: ta.Optional[ta.Callable[[], logging.Handler]] = None,
+
+        formatter: ta.Optional[logging.Formatter] = None,  # noqa
+        json: bool = False,
 ) -> ta.Optional[StandardConfiguredLoggingHandler]:
     with _locking_logging_module_lock():
         if target is None:
@@ -5692,11 +5707,11 @@ def configure_standard_logging(
 
         #
 
-        formatter: logging.Formatter
-        if json:
-            formatter = JsonLoggingFormatter()
-        else:
-            formatter = StandardLoggingFormatter(StandardLoggingFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))
+        if formatter is None:
+            if json:
+                formatter = JsonLoggingFormatter()
+            else:
+                formatter = StandardLoggingFormatter(StandardLoggingFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))  # noqa
         handler.setFormatter(formatter)
 
         #
@@ -6157,22 +6172,6 @@ class LoggingContextInfoRecordAdapters:
                 args=rec.args,
             )
 
-    # FIXME: handled specially - all unknown attrs on LogRecord
-    # class Extra(Adapter[LoggingContextInfos.Extra]):
-    #     _record_attrs: ta.ClassVar[ta.Mapping[str, ta.Union[ta.Any, ta.Tuple[ta.Any, ta.Any]]]] = dict()
-    #
-    #     def info_to_record(self, info: ta.Optional[LoggingContextInfos.Extra]) -> ta.Mapping[str, ta.Any]:
-    #         # FIXME:
-    #         # if extra is not None:
-    #         #     for key in extra:
-    #         #         if (key in ["message", "asctime"]) or (key in rv.__dict__):
-    #         #             raise KeyError("Attempt to overwrite %r in LogRecord" % key)
-    #         #         rv.__dict__[key] = extra[key]
-    #         return dict()
-    #
-    #     def record_to_info(self, rec: logging.LogRecord) -> ta.Optional[LoggingContextInfos.Extra]:
-    #         return None
-
     class Time(RequiredAdapter[LoggingContextInfos.Time]):
         info_cls: ta.ClassVar[ta.Type[LoggingContextInfos.Time]] = LoggingContextInfos.Time
 
@@ -6278,8 +6277,23 @@ class LoggingContextInfoRecordAdapters:
 
         def record_to_info(self, rec: logging.LogRecord) -> ta.Optional[LoggingContextInfos.Caller]:
             # FIXME: piecemeal?
-            # FIXME: strip _STACK_INFO_PREFIX
-            raise NotImplementedError
+            if (
+                    rec.pathname != self._UNKNOWN_PATH_NAME and
+                    rec.lineno != 0 and
+                    rec.funcName != self._UNKNOWN_FUNC_NAME
+            ):
+                if (sinfo := rec.stack_info) is not None and sinfo.startswith(self._STACK_INFO_PREFIX):
+                    sinfo = sinfo[len(self._STACK_INFO_PREFIX):]
+                return LoggingContextInfos.Caller(
+                    file_path=rec.pathname,
+
+                    line_no=rec.lineno,
+                    func_name=rec.funcName,
+
+                    stack_info=sinfo,
+                )
+
+            return None
 
     class SourceFile(Adapter[LoggingContextInfos.SourceFile]):
         info_cls: ta.ClassVar[ta.Type[LoggingContextInfos.SourceFile]] = LoggingContextInfos.SourceFile
@@ -6315,9 +6329,9 @@ class LoggingContextInfoRecordAdapters:
             )
 
         def record_to_info(self, rec: logging.LogRecord) -> ta.Optional[LoggingContextInfos.SourceFile]:
-            if not (
-                    rec.module is None or
-                    rec.module == self._UNKNOWN_MODULE
+            if (
+                    rec.module is not None and
+                    rec.module != self._UNKNOWN_MODULE
             ):
                 return LoggingContextInfos.SourceFile(
                     file_name=rec.filename,
@@ -6470,16 +6484,11 @@ _LOGGING_CONTEXT_INFO_RECORD_ADAPTERS: ta.Mapping[ta.Type[LoggingContextInfo], L
 ##
 
 
-KNOWN_STD_LOGGING_RECORD_ATTR_SET: ta.FrozenSet[str] = frozenset(
-    a for ad in _LOGGING_CONTEXT_INFO_RECORD_ADAPTERS.values() for a in ad.record_attrs
-)
-
-
 # Formatter:
 #  - https://github.com/python/cpython/blob/39b2f82717a69dde7212bc39b673b0f55c99e6a3/Lib/logging/__init__.py#L514 (3.8)
 #  - https://github.com/python/cpython/blob/f070f54c5f4a42c7c61d1d5d3b8f3b7203b4a0fb/Lib/logging/__init__.py#L554 (~3.14)  # noqa
 #
-KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTRS: ta.Dict[str, ta.Any] = dict(
+_KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTRS: ta.Dict[str, ta.Any] = dict(
     # The logged message, computed as msg % args. Set to `record.getMessage()`.
     message=str,
 
@@ -6493,7 +6502,15 @@ KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTRS: ta.Dict[str, ta.Any] = dict(
     exc_text=ta.Optional[str],
 )
 
-KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTR_SET: ta.FrozenSet[str] = frozenset(KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTRS)
+
+##
+
+
+_KNOWN_STD_LOGGING_RECORD_ATTR_SET: ta.FrozenSet[str] = frozenset(
+    a for ad in _LOGGING_CONTEXT_INFO_RECORD_ADAPTERS.values() for a in ad.record_attrs
+)
+
+_KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTR_SET: ta.FrozenSet[str] = frozenset(_KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTRS)
 
 
 class UnknownStdLoggingRecordAttrsWarning(LoggingSetupWarning):
@@ -6503,13 +6520,13 @@ class UnknownStdLoggingRecordAttrsWarning(LoggingSetupWarning):
 def _check_std_logging_record_attrs() -> None:
     if (
             len([a for ad in _LOGGING_CONTEXT_INFO_RECORD_ADAPTERS.values() for a in ad.record_attrs]) !=
-            len(KNOWN_STD_LOGGING_RECORD_ATTR_SET)
+            len(_KNOWN_STD_LOGGING_RECORD_ATTR_SET)
     ):
         raise RuntimeError('Duplicate LoggingContextInfoRecordAdapter record attrs')
 
     rec_dct = dict(logging.makeLogRecord({}).__dict__)
 
-    if (unk_rec_fields := frozenset(rec_dct) - KNOWN_STD_LOGGING_RECORD_ATTR_SET):
+    if (unk_rec_fields := frozenset(rec_dct) - _KNOWN_STD_LOGGING_RECORD_ATTR_SET):
         import warnings  # noqa
 
         warnings.warn(
@@ -6535,11 +6552,60 @@ class LoggingContextLogRecord(logging.LogRecord):
     #  - exc_info: LoggingExcInfoTuple | None
     #  - func: str | None = None -> funcName
     #  - sinfo: str | None = None -> stack_info
+    #
 
     def __init__(self, *, _logging_context: LoggingContext) -> None:  # noqa
+        self.__dict__.update(_logging_context=_logging_context)
+
         for ad in _LOGGING_CONTEXT_INFO_RECORD_ADAPTERS_:
             self.__dict__.update(ad.context_to_record(_logging_context))
 
+    _logging_context: LoggingContext
+
+    # FIXME: track extra
+    # def __setattr__(self, key, value):
+    #     super().__setattr__(key, value)
+
+
+##
+
+
+@ta.final
+class LogRecordLoggingContext(LoggingContext):
+    def __init__(self, rec: logging.LogRecord) -> None:
+        if isinstance(rec, LoggingContextLogRecord):
+            raise TypeError(rec)
+
+        self._rec = rec
+
+        infos: ta.List[LoggingContextInfo] = [
+            info
+            for ad in _LOGGING_CONTEXT_INFO_RECORD_ADAPTERS_
+            if (info := ad.record_to_info(rec)) is not None
+        ]
+
+        # FIXME:
+        # if extra is not None:
+        #     for key in extra:
+        #         if (key in ["message", "asctime"]) or (key in rv.__dict__):
+        #             raise KeyError("Attempt to overwrite %r in LogRecord" % key)
+        #         rv.__dict__[key] = extra[key]
+
+        if (extra := {
+            a: v
+            for a, v in rec.__dict__.items()
+            if a not in _KNOWN_STD_LOGGING_RECORD_ATTR_SET
+        }):
+            infos.append(LoggingContextInfos.Extra(extra))
+
+        self._infos: ta.Dict[ta.Type[LoggingContextInfo], LoggingContextInfo] = {
+            type(info): info
+            for info in infos
+        }
+
+    def get_info(self, ty: ta.Type[LoggingContextInfoT]) -> ta.Optional[LoggingContextInfoT]:
+        return self._infos.get(ty)
+
 
 ########################################
 # ../../../../../omlish/logs/std/loggers.py

ominfra/scripts/manage.py

@@ -10105,6 +10105,16 @@ class LoggingContext(Abstract):
             raise TypeError(f'LoggingContextInfo absent: {ty}')
         return info
 
+
+@ta.final
+class SimpleLoggingContext(LoggingContext):
+    def __init__(self, *infos: LoggingContextInfo) -> None:
+        self._infos: ta.Dict[ta.Type[LoggingContextInfo], LoggingContextInfo] = {type(i): i for i in infos}
+
+    def get_info(self, ty: ta.Type[LoggingContextInfoT]) -> ta.Optional[LoggingContextInfoT]:
+        return self._infos.get(ty)
+
+
 ##
 
 
@@ -10155,16 +10165,17 @@ class CaptureLoggingContextImpl(CaptureLoggingContext):
             stack_offset: int = 0,
             stack_info: bool = False,
     ) -> None:
-        # TODO: Name, Msg, Extra
-
         if time_ns is None:
             time_ns = time.time_ns()
 
+        # Done early to not trample on sys.exc_info()
+        exc = LoggingContextInfos.Exc.build(exc_info)
+
         self._infos: ta.Dict[ta.Type[LoggingContextInfo], LoggingContextInfo] = {}
         self._set_info(
             LoggingContextInfos.Level.build(level),
+            exc,
             LoggingContextInfos.Time.build(time_ns),
-            LoggingContextInfos.Exc.build(exc_info),
         )
 
         if caller is not CaptureLoggingContextImpl.NOT_SET:
@@ -10306,10 +10317,14 @@ def _locking_logging_module_lock() -> ta.Iterator[None]:
 def configure_standard_logging(
         level: ta.Union[int, str] = logging.INFO,
         *,
-        json: bool = False,
         target: ta.Optional[logging.Logger] = None,
+
         force: bool = False,
+
         handler_factory: ta.Optional[ta.Callable[[], logging.Handler]] = None,
+
+        formatter: ta.Optional[logging.Formatter] = None,  # noqa
+        json: bool = False,
 ) -> ta.Optional[StandardConfiguredLoggingHandler]:
     with _locking_logging_module_lock():
         if target is None:
@@ -10330,11 +10345,11 @@ def configure_standard_logging(
 
         #
 
-        formatter: logging.Formatter
-        if json:
-            formatter = JsonLoggingFormatter()
-        else:
-            formatter = StandardLoggingFormatter(StandardLoggingFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))
+        if formatter is None:
+            if json:
+                formatter = JsonLoggingFormatter()
+            else:
+                formatter = StandardLoggingFormatter(StandardLoggingFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))  # noqa
         handler.setFormatter(formatter)
 
         #
@@ -11394,22 +11409,6 @@ class LoggingContextInfoRecordAdapters:
                 args=rec.args,
             )
 
-    # FIXME: handled specially - all unknown attrs on LogRecord
-    # class Extra(Adapter[LoggingContextInfos.Extra]):
-    #     _record_attrs: ta.ClassVar[ta.Mapping[str, ta.Union[ta.Any, ta.Tuple[ta.Any, ta.Any]]]] = dict()
-    #
-    #     def info_to_record(self, info: ta.Optional[LoggingContextInfos.Extra]) -> ta.Mapping[str, ta.Any]:
-    #         # FIXME:
-    #         # if extra is not None:
-    #         #     for key in extra:
-    #         #         if (key in ["message", "asctime"]) or (key in rv.__dict__):
-    #         #             raise KeyError("Attempt to overwrite %r in LogRecord" % key)
-    #         #         rv.__dict__[key] = extra[key]
-    #         return dict()
-    #
-    #     def record_to_info(self, rec: logging.LogRecord) -> ta.Optional[LoggingContextInfos.Extra]:
-    #         return None
-
     class Time(RequiredAdapter[LoggingContextInfos.Time]):
         info_cls: ta.ClassVar[ta.Type[LoggingContextInfos.Time]] = LoggingContextInfos.Time
 
@@ -11515,8 +11514,23 @@ class LoggingContextInfoRecordAdapters:
 
         def record_to_info(self, rec: logging.LogRecord) -> ta.Optional[LoggingContextInfos.Caller]:
             # FIXME: piecemeal?
-            # FIXME: strip _STACK_INFO_PREFIX
-            raise NotImplementedError
+            if (
+                    rec.pathname != self._UNKNOWN_PATH_NAME and
+                    rec.lineno != 0 and
+                    rec.funcName != self._UNKNOWN_FUNC_NAME
+            ):
+                if (sinfo := rec.stack_info) is not None and sinfo.startswith(self._STACK_INFO_PREFIX):
+                    sinfo = sinfo[len(self._STACK_INFO_PREFIX):]
+                return LoggingContextInfos.Caller(
+                    file_path=rec.pathname,
+
+                    line_no=rec.lineno,
+                    func_name=rec.funcName,
+
+                    stack_info=sinfo,
+                )
+
+            return None
 
     class SourceFile(Adapter[LoggingContextInfos.SourceFile]):
         info_cls: ta.ClassVar[ta.Type[LoggingContextInfos.SourceFile]] = LoggingContextInfos.SourceFile
@@ -11552,9 +11566,9 @@ class LoggingContextInfoRecordAdapters:
             )
 
         def record_to_info(self, rec: logging.LogRecord) -> ta.Optional[LoggingContextInfos.SourceFile]:
-            if not (
-                    rec.module is None or
-                    rec.module == self._UNKNOWN_MODULE
+            if (
+                    rec.module is not None and
+                    rec.module != self._UNKNOWN_MODULE
             ):
                 return LoggingContextInfos.SourceFile(
                     file_name=rec.filename,
@@ -11707,16 +11721,11 @@ _LOGGING_CONTEXT_INFO_RECORD_ADAPTERS: ta.Mapping[ta.Type[LoggingContextInfo], L
 ##
 
 
-KNOWN_STD_LOGGING_RECORD_ATTR_SET: ta.FrozenSet[str] = frozenset(
-    a for ad in _LOGGING_CONTEXT_INFO_RECORD_ADAPTERS.values() for a in ad.record_attrs
-)
-
-
 # Formatter:
 #  - https://github.com/python/cpython/blob/39b2f82717a69dde7212bc39b673b0f55c99e6a3/Lib/logging/__init__.py#L514 (3.8)
 #  - https://github.com/python/cpython/blob/f070f54c5f4a42c7c61d1d5d3b8f3b7203b4a0fb/Lib/logging/__init__.py#L554 (~3.14)  # noqa
 #
-KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTRS: ta.Dict[str, ta.Any] = dict(
+_KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTRS: ta.Dict[str, ta.Any] = dict(
     # The logged message, computed as msg % args. Set to `record.getMessage()`.
     message=str,
 
@@ -11730,7 +11739,15 @@ KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTRS: ta.Dict[str, ta.Any] = dict(
     exc_text=ta.Optional[str],
 )
 
-KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTR_SET: ta.FrozenSet[str] = frozenset(KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTRS)
+
+##
+
+
+_KNOWN_STD_LOGGING_RECORD_ATTR_SET: ta.FrozenSet[str] = frozenset(
+    a for ad in _LOGGING_CONTEXT_INFO_RECORD_ADAPTERS.values() for a in ad.record_attrs
+)
+
+_KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTR_SET: ta.FrozenSet[str] = frozenset(_KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTRS)
 
 
 class UnknownStdLoggingRecordAttrsWarning(LoggingSetupWarning):
@@ -11740,13 +11757,13 @@ class UnknownStdLoggingRecordAttrsWarning(LoggingSetupWarning):
 def _check_std_logging_record_attrs() -> None:
     if (
             len([a for ad in _LOGGING_CONTEXT_INFO_RECORD_ADAPTERS.values() for a in ad.record_attrs]) !=
-            len(KNOWN_STD_LOGGING_RECORD_ATTR_SET)
+            len(_KNOWN_STD_LOGGING_RECORD_ATTR_SET)
     ):
         raise RuntimeError('Duplicate LoggingContextInfoRecordAdapter record attrs')
 
     rec_dct = dict(logging.makeLogRecord({}).__dict__)
 
-    if (unk_rec_fields := frozenset(rec_dct) - KNOWN_STD_LOGGING_RECORD_ATTR_SET):
+    if (unk_rec_fields := frozenset(rec_dct) - _KNOWN_STD_LOGGING_RECORD_ATTR_SET):
         import warnings  # noqa
 
         warnings.warn(
@@ -11772,11 +11789,60 @@ class LoggingContextLogRecord(logging.LogRecord):
     #  - exc_info: LoggingExcInfoTuple | None
     #  - func: str | None = None -> funcName
     #  - sinfo: str | None = None -> stack_info
+    #
 
     def __init__(self, *, _logging_context: LoggingContext) -> None:  # noqa
+        self.__dict__.update(_logging_context=_logging_context)
+
         for ad in _LOGGING_CONTEXT_INFO_RECORD_ADAPTERS_:
             self.__dict__.update(ad.context_to_record(_logging_context))
 
+    _logging_context: LoggingContext
+
+    # FIXME: track extra
+    # def __setattr__(self, key, value):
+    #     super().__setattr__(key, value)
+
+
+##
+
+
+@ta.final
+class LogRecordLoggingContext(LoggingContext):
+    def __init__(self, rec: logging.LogRecord) -> None:
+        if isinstance(rec, LoggingContextLogRecord):
+            raise TypeError(rec)
+
+        self._rec = rec
+
+        infos: ta.List[LoggingContextInfo] = [
+            info
+            for ad in _LOGGING_CONTEXT_INFO_RECORD_ADAPTERS_
+            if (info := ad.record_to_info(rec)) is not None
+        ]
+
+        # FIXME:
+        # if extra is not None:
+        #     for key in extra:
+        #         if (key in ["message", "asctime"]) or (key in rv.__dict__):
+        #             raise KeyError("Attempt to overwrite %r in LogRecord" % key)
+        #         rv.__dict__[key] = extra[key]
+
+        if (extra := {
+            a: v
+            for a, v in rec.__dict__.items()
+            if a not in _KNOWN_STD_LOGGING_RECORD_ATTR_SET
+        }):
+            infos.append(LoggingContextInfos.Extra(extra))
+
+        self._infos: ta.Dict[ta.Type[LoggingContextInfo], LoggingContextInfo] = {
+            type(info): info
+            for info in infos
+        }
+
+    def get_info(self, ty: ta.Type[LoggingContextInfoT]) -> ta.Optional[LoggingContextInfoT]:
+        return self._infos.get(ty)
+
 
 ########################################
 # ../../../omlish/subprocesses/base.py

ominfra/scripts/supervisor.py

@@ -8591,6 +8591,16 @@ class LoggingContext(Abstract):
             raise TypeError(f'LoggingContextInfo absent: {ty}')
         return info
 
+
+@ta.final
+class SimpleLoggingContext(LoggingContext):
+    def __init__(self, *infos: LoggingContextInfo) -> None:
+        self._infos: ta.Dict[ta.Type[LoggingContextInfo], LoggingContextInfo] = {type(i): i for i in infos}
+
+    def get_info(self, ty: ta.Type[LoggingContextInfoT]) -> ta.Optional[LoggingContextInfoT]:
+        return self._infos.get(ty)
+
+
 ##
 
 
@@ -8641,16 +8651,17 @@ class CaptureLoggingContextImpl(CaptureLoggingContext):
             stack_offset: int = 0,
             stack_info: bool = False,
     ) -> None:
-        # TODO: Name, Msg, Extra
-
         if time_ns is None:
             time_ns = time.time_ns()
 
+        # Done early to not trample on sys.exc_info()
+        exc = LoggingContextInfos.Exc.build(exc_info)
+
         self._infos: ta.Dict[ta.Type[LoggingContextInfo], LoggingContextInfo] = {}
         self._set_info(
             LoggingContextInfos.Level.build(level),
+            exc,
             LoggingContextInfos.Time.build(time_ns),
-            LoggingContextInfos.Exc.build(exc_info),
         )
 
         if caller is not CaptureLoggingContextImpl.NOT_SET:
@@ -8792,10 +8803,14 @@ def _locking_logging_module_lock() -> ta.Iterator[None]:
 def configure_standard_logging(
         level: ta.Union[int, str] = logging.INFO,
         *,
-        json: bool = False,
         target: ta.Optional[logging.Logger] = None,
+
         force: bool = False,
+
         handler_factory: ta.Optional[ta.Callable[[], logging.Handler]] = None,
+
+        formatter: ta.Optional[logging.Formatter] = None,  # noqa
+        json: bool = False,
 ) -> ta.Optional[StandardConfiguredLoggingHandler]:
     with _locking_logging_module_lock():
         if target is None:
@@ -8816,11 +8831,11 @@ def configure_standard_logging(
 
         #
 
-        formatter: logging.Formatter
-        if json:
-            formatter = JsonLoggingFormatter()
-        else:
-            formatter = StandardLoggingFormatter(StandardLoggingFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))
+        if formatter is None:
+            if json:
+                formatter = JsonLoggingFormatter()
+            else:
+                formatter = StandardLoggingFormatter(StandardLoggingFormatter.build_log_format(STANDARD_LOG_FORMAT_PARTS))  # noqa
         handler.setFormatter(formatter)
 
         #
@@ -10002,22 +10017,6 @@ class LoggingContextInfoRecordAdapters:
                 args=rec.args,
             )
 
-    # FIXME: handled specially - all unknown attrs on LogRecord
-    # class Extra(Adapter[LoggingContextInfos.Extra]):
-    #     _record_attrs: ta.ClassVar[ta.Mapping[str, ta.Union[ta.Any, ta.Tuple[ta.Any, ta.Any]]]] = dict()
-    #
-    #     def info_to_record(self, info: ta.Optional[LoggingContextInfos.Extra]) -> ta.Mapping[str, ta.Any]:
-    #         # FIXME:
-    #         # if extra is not None:
-    #         #     for key in extra:
-    #         #         if (key in ["message", "asctime"]) or (key in rv.__dict__):
-    #         #             raise KeyError("Attempt to overwrite %r in LogRecord" % key)
-    #         #         rv.__dict__[key] = extra[key]
-    #         return dict()
-    #
-    #     def record_to_info(self, rec: logging.LogRecord) -> ta.Optional[LoggingContextInfos.Extra]:
-    #         return None
-
     class Time(RequiredAdapter[LoggingContextInfos.Time]):
         info_cls: ta.ClassVar[ta.Type[LoggingContextInfos.Time]] = LoggingContextInfos.Time
 
@@ -10123,8 +10122,23 @@ class LoggingContextInfoRecordAdapters:
 
         def record_to_info(self, rec: logging.LogRecord) -> ta.Optional[LoggingContextInfos.Caller]:
             # FIXME: piecemeal?
-            # FIXME: strip _STACK_INFO_PREFIX
-            raise NotImplementedError
+            if (
+                    rec.pathname != self._UNKNOWN_PATH_NAME and
+                    rec.lineno != 0 and
+                    rec.funcName != self._UNKNOWN_FUNC_NAME
+            ):
+                if (sinfo := rec.stack_info) is not None and sinfo.startswith(self._STACK_INFO_PREFIX):
+                    sinfo = sinfo[len(self._STACK_INFO_PREFIX):]
+                return LoggingContextInfos.Caller(
+                    file_path=rec.pathname,
+
+                    line_no=rec.lineno,
+                    func_name=rec.funcName,
+
+                    stack_info=sinfo,
+                )
+
+            return None
 
     class SourceFile(Adapter[LoggingContextInfos.SourceFile]):
         info_cls: ta.ClassVar[ta.Type[LoggingContextInfos.SourceFile]] = LoggingContextInfos.SourceFile
@@ -10160,9 +10174,9 @@ class LoggingContextInfoRecordAdapters:
             )
 
         def record_to_info(self, rec: logging.LogRecord) -> ta.Optional[LoggingContextInfos.SourceFile]:
-            if not (
-                    rec.module is None or
-                    rec.module == self._UNKNOWN_MODULE
+            if (
+                    rec.module is not None and
+                    rec.module != self._UNKNOWN_MODULE
             ):
                 return LoggingContextInfos.SourceFile(
                     file_name=rec.filename,
@@ -10315,16 +10329,11 @@ _LOGGING_CONTEXT_INFO_RECORD_ADAPTERS: ta.Mapping[ta.Type[LoggingContextInfo], L
 ##
 
 
-KNOWN_STD_LOGGING_RECORD_ATTR_SET: ta.FrozenSet[str] = frozenset(
-    a for ad in _LOGGING_CONTEXT_INFO_RECORD_ADAPTERS.values() for a in ad.record_attrs
-)
-
-
 # Formatter:
 #  - https://github.com/python/cpython/blob/39b2f82717a69dde7212bc39b673b0f55c99e6a3/Lib/logging/__init__.py#L514 (3.8)
 #  - https://github.com/python/cpython/blob/f070f54c5f4a42c7c61d1d5d3b8f3b7203b4a0fb/Lib/logging/__init__.py#L554 (~3.14)  # noqa
 #
-KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTRS: ta.Dict[str, ta.Any] = dict(
+_KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTRS: ta.Dict[str, ta.Any] = dict(
     # The logged message, computed as msg % args. Set to `record.getMessage()`.
     message=str,
 
@@ -10338,7 +10347,15 @@ KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTRS: ta.Dict[str, ta.Any] = dict(
     exc_text=ta.Optional[str],
 )
 
-KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTR_SET: ta.FrozenSet[str] = frozenset(KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTRS)
+
+##
+
+
+_KNOWN_STD_LOGGING_RECORD_ATTR_SET: ta.FrozenSet[str] = frozenset(
+    a for ad in _LOGGING_CONTEXT_INFO_RECORD_ADAPTERS.values() for a in ad.record_attrs
+)
+
+_KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTR_SET: ta.FrozenSet[str] = frozenset(_KNOWN_STD_LOGGING_FORMATTER_RECORD_ATTRS)
 
 
 class UnknownStdLoggingRecordAttrsWarning(LoggingSetupWarning):
@@ -10348,13 +10365,13 @@ class UnknownStdLoggingRecordAttrsWarning(LoggingSetupWarning):
 def _check_std_logging_record_attrs() -> None:
     if (
             len([a for ad in _LOGGING_CONTEXT_INFO_RECORD_ADAPTERS.values() for a in ad.record_attrs]) !=
-            len(KNOWN_STD_LOGGING_RECORD_ATTR_SET)
+            len(_KNOWN_STD_LOGGING_RECORD_ATTR_SET)
     ):
         raise RuntimeError('Duplicate LoggingContextInfoRecordAdapter record attrs')
 
     rec_dct = dict(logging.makeLogRecord({}).__dict__)
 
-    if (unk_rec_fields := frozenset(rec_dct) - KNOWN_STD_LOGGING_RECORD_ATTR_SET):
+    if (unk_rec_fields := frozenset(rec_dct) - _KNOWN_STD_LOGGING_RECORD_ATTR_SET):
         import warnings  # noqa
 
         warnings.warn(
@@ -10380,11 +10397,60 @@ class LoggingContextLogRecord(logging.LogRecord):
     #  - exc_info: LoggingExcInfoTuple | None
     #  - func: str | None = None -> funcName
     #  - sinfo: str | None = None -> stack_info
+    #
 
     def __init__(self, *, _logging_context: LoggingContext) -> None:  # noqa
+        self.__dict__.update(_logging_context=_logging_context)
+
         for ad in _LOGGING_CONTEXT_INFO_RECORD_ADAPTERS_:
             self.__dict__.update(ad.context_to_record(_logging_context))
 
+    _logging_context: LoggingContext
+
+    # FIXME: track extra
+    # def __setattr__(self, key, value):
+    #     super().__setattr__(key, value)
+
+
+##
+
+
+@ta.final
+class LogRecordLoggingContext(LoggingContext):
+    def __init__(self, rec: logging.LogRecord) -> None:
+        if isinstance(rec, LoggingContextLogRecord):
+            raise TypeError(rec)
+
+        self._rec = rec
+
+        infos: ta.List[LoggingContextInfo] = [
+            info
+            for ad in _LOGGING_CONTEXT_INFO_RECORD_ADAPTERS_
+            if (info := ad.record_to_info(rec)) is not None
+        ]
+
+        # FIXME:
+        # if extra is not None:
+        #     for key in extra:
+        #         if (key in ["message", "asctime"]) or (key in rv.__dict__):
+        #             raise KeyError("Attempt to overwrite %r in LogRecord" % key)
+        #         rv.__dict__[key] = extra[key]
+
+        if (extra := {
+            a: v
+            for a, v in rec.__dict__.items()
+            if a not in _KNOWN_STD_LOGGING_RECORD_ATTR_SET
+        }):
+            infos.append(LoggingContextInfos.Extra(extra))
+
+        self._infos: ta.Dict[ta.Type[LoggingContextInfo], LoggingContextInfo] = {
+            type(info): info
+            for info in infos
+        }
+
+    def get_info(self, ty: ta.Type[LoggingContextInfoT]) -> ta.Optional[LoggingContextInfoT]:
+        return self._infos.get(ty)
+
 
 ########################################
 # ../dispatchers.py

{ominfra-0.0.0.dev431.dist-info → ominfra-0.0.0.dev433.dist-info}/METADATA

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

{ominfra-0.0.0.dev431.dist-info → ominfra-0.0.0.dev433.dist-info}/RECORD

@@ -112,9 +112,9 @@ ominfra/manage/targets/connection.py,sha256=mOHCsDVG-DZBhl3Mb7TTr1vhPb0gxDOOMW1x
 ominfra/manage/targets/inject.py,sha256=3M4wBkxtvymq_yhiotHlTN8iydELMjVCndyp9Bq-4eo,1572
 ominfra/manage/targets/targets.py,sha256=LjSQrDsHEjEQMDHcxtNKmLjy0YGLXJRGPFdUjazzFIM,1918
 ominfra/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ominfra/scripts/journald2aws.py,sha256=vk8CdqFkHxr-ehrZ-PPp5GQ05bdbwS_ul8d8bcOGznw,240702
-ominfra/scripts/manage.py,sha256=zgVcSuduHT48pCoqJvkYYhB81yOe839h5KxPBfnWVoA,464423
-ominfra/scripts/supervisor.py,sha256=5W9BDeAi5M8KwnNMqcgfn9H7UlHJGuuYiWDVp3p2CE0,374162
+ominfra/scripts/journald2aws.py,sha256=djP-ywraucrb3UTm0oCk1WjugORbV_tcvJPXSZQAhdE,242341
+ominfra/scripts/manage.py,sha256=HZU2z0BC32nokLzqi8CDeQi7xcY_SDnbNRS4lPP5Y58,466062
+ominfra/scripts/supervisor.py,sha256=GM8cRAi6hkOx3-RQRiN-DrBYNsZba0vOmraaYL0OWIk,375801
 ominfra/supervisor/LICENSE.txt,sha256=ZrHY15PVR98y26Yg6iQfa-SXnUaYTDhrUsPVcEO5OKM,1874
 ominfra/supervisor/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 ominfra/supervisor/__main__.py,sha256=I0yFw-C08OOiZ3BF6lF1Oiv789EQXu-_j6whDhQUTEA,66
@@ -156,9 +156,9 @@ ominfra/tailscale/api.py,sha256=XASv9C_CWI-u-yX5jVzhJrkJhlwQRkYQWQQG1uJwAd8,1375
 ominfra/tailscale/cli.py,sha256=zRV7-tKB7kBah1oTVZlol-vwx1FBlnfzYAPGkeU5jX4,3543
 ominfra/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ominfra/tools/listresources.py,sha256=ePmo7cUAiBZARkM_3K4GKYZXxV73An_aioS1m-AAJis,6181
-ominfra-0.0.0.dev431.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ominfra-0.0.0.dev431.dist-info/METADATA,sha256=3i5UVpLScKololuVLWCYbIDvRF_8d6zGi0QKHb_FdYY,2377
-ominfra-0.0.0.dev431.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ominfra-0.0.0.dev431.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
-ominfra-0.0.0.dev431.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
-ominfra-0.0.0.dev431.dist-info/RECORD,,
+ominfra-0.0.0.dev433.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ominfra-0.0.0.dev433.dist-info/METADATA,sha256=QDFpqnzcVehom36HXSyoF0m4Qb4GzikrHIUSAOmbJqM,2377
+ominfra-0.0.0.dev433.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ominfra-0.0.0.dev433.dist-info/entry_points.txt,sha256=kgecQ2MgGrM9qK744BoKS3tMesaC3yjLnl9pa5CRczg,37
+ominfra-0.0.0.dev433.dist-info/top_level.txt,sha256=E-b2OHkk_AOBLXHYZQ2EOFKl-_6uOGd8EjeG-Zy6h_w,8
+ominfra-0.0.0.dev433.dist-info/RECORD,,